Version 5.0.0 beta 7
This commit is contained in:
1 parent
fa2a720105
commit
54d5dcd0a0
156 files changed
+4337
-2995
No files matched your search
+18
-12
@@ -1118,24 +1118,28 @@ abstract class Model extends ActiveRecord
|
||||
*/
|
||||
public function checkAction( string $action ) : bool
|
||||
{
|
||||
/* Check bitoptions */
|
||||
foreach( static::$bitOptions as $key => $values )
|
||||
{
|
||||
if( isset( $this->$key[ $action ] ) )
|
||||
{
|
||||
return (bool) $this->$key[ $action ];
|
||||
}
|
||||
}
|
||||
|
||||
/* Check the column mapping */
|
||||
if( isset( static::$actionColumnMap[ $action ] ) )
|
||||
{
|
||||
$column = static::$actionColumnMap[ $action ];
|
||||
return (bool) $this->$column;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Default to true because this means there is nothing in the node itself that should prevent this */
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/* Default to true because this means there is nothing in the node itself that should prevent this */
|
||||
return TRUE;
|
||||
/* Check bitoptions */
|
||||
foreach( static::$bitOptions as $key => $values )
|
||||
{
|
||||
if( isset( $this->$key[ $column ] ) )
|
||||
{
|
||||
return (bool) $this->$key[ $column ];
|
||||
}
|
||||
}
|
||||
|
||||
/* Check the column mapping */
|
||||
return (bool) $this->$column;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -3665,6 +3669,8 @@ abstract class Model extends ActiveRecord
|
||||
*/
|
||||
public function saveForm( array $values ): mixed
|
||||
{
|
||||
$values = array_merge( $values, $this->ui( 'processForm', array( $values ), true ) );
|
||||
|
||||
foreach ( $values as $k => $v )
|
||||
{
|
||||
if( $k == 'csrfKey' )
|
||||
|
||||
Reference in new issue
Block a user