Merge branch 'sprint/208_tianshujie_58554' into 'master'

Sprint/208 tianshujie 58554 See merge request easycorp/zentaopms!4317
2022-07-04 06:59:21 +00:00
parent 1a82574947 14037d612b
commit 04b2a5994f
10 changed files with 348 additions and 142 deletions
@@ -676,14 +676,17 @@ class custom extends control
        $account = $this->app->user->account;
        if($this->server->request_method == 'POST')
        {
-            $fields  = $this->post->fields;
+            $fields = $this->post->fields;
            if(is_array($fields)) $fields = join(',', $fields);
            $this->loadModel('setting')->setItem("$account.$module.$section.$key", $fields);
+            if(in_array($module, array('task', 'testcase', 'story')) and $section == 'custom' and in_array($key, array('createFields', 'batchCreateFields'))) return;
+            if($module == 'bug' and $section == 'custom' and $key == 'batchCreateFields') return;
        }
        else
        {
            $this->loadModel('setting')->deleteItems("owner=$account&module=$module&section=$section&key=$key");
        }
+
        return print(js::reload('parent'));
    }