Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [task#148795,done,1h,0h] Fix extra readonly field is required error.

Browse Source
This commit is contained in:
wangyuting
2025-08-26 08:51:54 +08:00
parent 2f6e915901
commit 862986cbe6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/control.class.php
+1 -1
View File
@@ -638,7 +638,7 @@ class control extends baseControl
if($object && empty($object->{$field->field})) $object->{$field->field} = $field->defaultValue;
if(in_array($field->type, $this->config->workflowfield->numberTypes)) $field = $this->workflowfield->processNumberField($field);
$field->required = $field->readonly || ($notEmptyRule && strpos(",$field->rules,", ",{$notEmptyRule->id},") !== false);
$field->required = !$field->readonly && $notEmptyRule && strpos(",$field->rules,", ",{$notEmptyRule->id},") !== false;
$field->control = $this->flow->buildFormControl($field);
$field->items = $field->options ? array_filter($field->options) : null;
$field->value = !empty($object->{$field->field}) ? zget($object, $field->field, '') : '';
lib/form/form.class.php
+1 -1
View File
@@ -166,7 +166,7 @@ class form extends fixer
if($field->buildin || !$field->show || !isset($layouts[$field->field])) continue;
if($field->control == 'file') continue;
$required = $field->readonly || ($notEmptyRule && strpos(",$field->rules,", ",{$notEmptyRule->id},") !== false);
$required = !$field->readonly && $notEmptyRule && strpos(",$field->rules,", ",{$notEmptyRule->id},") !== false;
if($field->control == 'multi-select' || $field->control == 'checkbox')
{
$configObject[$field->field] = array('required' => $required, 'type' => 'array', 'default' => array(''), 'filter' => 'join');