push to switch branches

This commit is contained in:
spencerrlongg 2024-03-13 10:40:50 -05:00
parent 04d7884af8
commit 8962ced038

View file

@ -244,8 +244,12 @@ class Asset extends Depreciable
$this->{$field->db_column} = filter_var($this->{$field->db_column}, FILTER_VALIDATE_BOOLEAN); $this->{$field->db_column} = filter_var($this->{$field->db_column}, FILTER_VALIDATE_BOOLEAN);
} }
} }
$this->rules = array_merge(
$this->rules,
$model->fieldset->validation_rules(),
);
$this->rules += $model->fieldset->validation_rules(); //$this->rules += $model->fieldset->validation_rules();
if ($this->model->fieldset){ if ($this->model->fieldset){
foreach ($this->model->fieldset->fields as $field){ foreach ($this->model->fieldset->fields as $field){