From 2c1012d112eeb43bf2621d6b07d4fa0b5f824336 Mon Sep 17 00:00:00 2001 From: sunhao Date: Sat, 11 May 2024 18:24:01 +0800 Subject: [PATCH] * productplan: bug #49513, fix error on create productplan. --- lib/zin/wg/formgroup/v1.php | 11 ++++++----- module/productplan/ui/create.html.php | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/zin/wg/formgroup/v1.php b/lib/zin/wg/formgroup/v1.php index afe5751a2c..17089a4821 100644 --- a/lib/zin/wg/formgroup/v1.php +++ b/lib/zin/wg/formgroup/v1.php @@ -62,14 +62,15 @@ class formGroup extends wg $required = $this->prop('required'); if($required === 'auto') { - $childrens = $this->children(); - if($this->hasProp('name')) $required = isFieldRequired($this->prop('name'), $this->prop('requiredFields')); - else if($childrens) + $children = $this->children(); + $requiredFields = $this->prop('requiredFields'); + if($this->hasProp('name')) $required = isFieldRequired($this->prop('name'), $requiredFields); + else if($children) { $required = false; - foreach($childrens as $children) + foreach($children as $child) { - if(isFieldRequired($children->prop('name'), $this->prop('requiredFields'))) $required = true; + if($child instanceof node && $child->hasProp('name') && isFieldRequired($child->prop('name'), $requiredFields)) $required = true; } } else $required = false; diff --git a/module/productplan/ui/create.html.php b/module/productplan/ui/create.html.php index 23e4b61c12..158efb1af0 100644 --- a/module/productplan/ui/create.html.php +++ b/module/productplan/ui/create.html.php @@ -41,7 +41,7 @@ formPanel ( set::className('items-center'), set::label($lang->productplan->product), - span($product->name) + $product->name ) : null, !$parent ? formGroup (