Merge branch 'feedback_1869' into 'master'

* Resolve feedback#1869 See merge request easycorp/zentaopms!6698
2023-01-05 23:02:35 +00:00
parent 71d5328696 cb85a430d4
commit b0c62ecd41
1 changed files with 13 additions and 1 deletions
@@ -48,7 +48,19 @@ class custom extends control
        $currentLang = $this->app->getClientLang();

        $this->app->loadLang($module);
-        $fieldList = zget($this->lang->$module, $field, '');
+        if($lang == 'all')
+        {
+            $fieldList = array();
+            $items     = $this->custom->getItems("lang=all&module=$module&section=$field&vision={$this->config->vision}");
+            foreach($items as $key => $item)
+            {
+                $fieldList[$key] = $item->value;
+            }
+        }
+        else
+        {
+            $fieldList = zget($this->lang->$module, $field, '');
+        }

        if($module == 'project' and $field == 'unitList')
        {