From 78608484b700ef1158000ebb4989d72b2d14b61b Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Thu, 30 Jun 2022 17:26:57 +0800 Subject: [PATCH] * Fix bug #24638. --- module/custom/model.php | 4 +++- module/setting/model.php | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/module/custom/model.php b/module/custom/model.php index 2ff04d5438..93274c6418 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -701,8 +701,10 @@ class customModel extends model } } + $vision = $this->config->vision; + $this->loadModel('setting'); - $this->setting->setItems("system.{$moduleName}", $requiredFields); + $this->setting->setItems("system.{$moduleName}@$vision", $requiredFields); } /** diff --git a/module/setting/model.php b/module/setting/model.php index cfbf2020e3..b313485796 100644 --- a/module/setting/model.php +++ b/module/setting/model.php @@ -194,6 +194,8 @@ class settingModel extends model ->fetchAll('id'); if(!$records) return array(); + $vision = $this->config->vision; + /* Group records by owner and module. */ $config = array(); foreach($records as $record) @@ -202,6 +204,9 @@ class settingModel extends model if(!isset($record->module)) return array(); // If no module field, return directly. Since 3.2 version, there's the module field. if(empty($record->module)) continue; + /* If it`s lite vision unset config requiredFields */ + if($vision == 'lite' and $record->key == 'requiredFields' and $record->vision == '') continue; + $config[$record->owner]->{$record->module}[] = $record; } return $config;