From 511978cd0c6c813bf40a1bfc50950deae364e66b Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 31 Mar 2016 11:28:36 +0800 Subject: [PATCH] * adjust for task #2545,2547. --- module/common/lang/en.php | 2 +- module/common/lang/zh-cn.php | 2 +- module/common/view/customfield.html.php | 4 ++-- module/custom/control.php | 11 +++-------- module/story/config.php | 3 +++ module/story/control.php | 2 +- module/story/model.php | 2 +- module/story/view/create.html.php | 12 ++++++------ module/task/config.php | 3 +++ module/task/control.php | 2 +- module/task/view/create.html.php | 12 ++++++------ 11 files changed, 28 insertions(+), 27 deletions(-) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 08a0883fdd..648a868ebd 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -64,7 +64,7 @@ $lang->duplicate = '%s has the same title'; $lang->ipLimited = "Sorry, current IP is limited by Administrator. Please contact the Administrator to lift the restrictions."; $lang->unfold = '+'; $lang->fold = '-'; -$lang->checked2Hide = 'Hide checked field.'; +$lang->hideNotCheck = 'Hide not checked field'; $lang->preShortcutKey = '[Shortcut key:←]'; $lang->nextShortcutKey = '[Shortcut key:→]'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 07ecceb859..bb34cea142 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -64,7 +64,7 @@ $lang->duplicate = '已有相同标题的%s'; $lang->ipLimited = "抱歉，管理员限制当前IP登录，请联系管理员解除限制。"; $lang->unfold = '+'; $lang->fold = '-'; -$lang->checked2Hide = '选中字段在页面不显示'; +$lang->hideNotCheck = '页面隐藏取消选中字段'; $lang->preShortcutKey = '[快捷键:←]'; $lang->nextShortcutKey = '[快捷键:→]'; diff --git a/module/common/view/customfield.html.php b/module/common/view/customfield.html.php index 17ae1e3492..27e1a403b5 100644 --- a/module/common/view/customfield.html.php +++ b/module/common/view/customfield.html.php @@ -19,8 +19,8 @@
-

-

checked2Hide?>

+

+

hideNotCheck?>

diff --git a/module/custom/control.php b/module/custom/control.php index 1f69aeabe6..f7f3c367bd 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -155,14 +155,9 @@ class custom extends control public function ajaxSaveCustom($module, $section, $key) { $account = $this->app->user->account; - if($_POST) - { - $this->loadModel('setting')->setItem("$account.$module.$section.$key", join(',', $this->post->fields)); - } - else - { - $this->loadModel('setting')->deleteItems("owner=$account&module=$module§ion=$section&key=$key"); - } + $fields = $this->post->fields; + if(is_array($fields)) $fields = join(',', $fields); + $this->loadModel('setting')->setItem("$account.$module.$section.$key", $fields); die(js::reload('parent')); } } diff --git a/module/story/config.php b/module/story/config.php index 87ae669151..365c9f9bf2 100644 --- a/module/story/config.php +++ b/module/story/config.php @@ -41,6 +41,9 @@ $config->story->list->exportFields = ' childStories, linkStories, duplicateStory, files'; $config->story->list->customCreateFields = 'source,verify,pri,estimate,mailto,keywords'; +$config->story->custom = new stdclass(); +$config->story->custom->create = $config->story->list->customCreateFields; + $config->story->datatable = new stdclass(); $config->story->datatable->defaultField = array('id', 'pri', 'title', 'plan', 'source', 'openedBy', 'assignedTo', 'estimate', 'status', 'stage', 'actions'); diff --git a/module/story/control.php b/module/story/control.php index d134f41495..61b6469fe4 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -164,7 +164,7 @@ class story extends control /* Set Custom*/ foreach(explode(',', $this->config->story->list->customCreateFields) as $field) $customFields[$field] = $this->lang->story->$field; $this->view->customFields = $customFields; - $this->view->hiddenFields = isset($this->config->story->custom->create) ? $this->config->story->custom->create : ''; + $this->view->showFields = $this->config->story->custom->create; $this->view->title = $product->name . $this->lang->colon . $this->lang->story->create; $this->view->position[] = html::a($this->createLink('product', 'browse', "product=$productID&branch=$branch"), $product->name); diff --git a/module/story/model.php b/module/story/model.php index 327d544a96..197e7e263a 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -145,7 +145,7 @@ class storyModel extends model ->cleanInt('product,module,pri,plan') ->cleanFloat('estimate') ->callFunc('title', 'trim') - ->setDefault('plan', '') + ->setDefault('plan,verify', '') ->add('openedBy', $this->app->user->account) ->add('openedDate', $now) ->add('assignedDate', 0) diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index d674421e03..4f5939c761 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -67,7 +67,7 @@ ?> - +
story->source?> @@ -93,8 +93,8 @@
@@ -129,15 +129,15 @@ story->spec;?>
story->specTemplate;?>
- + story->verify;?> diff --git a/module/task/config.php b/module/task/config.php index d2e6c1fb02..c9d95b7667 100644 --- a/module/task/config.php +++ b/module/task/config.php @@ -42,6 +42,9 @@ $config->task->exportFields = ' '; $config->task->customCreateFields = 'story,estStarted,deadline,mailto,pri,estimate'; +$config->task->custom = new stdclass(); +$config->task->custom->create = $config->task->customCreateFields; + $config->task->datatable = new stdclass(); $config->task->datatable->defaultField = array('id', 'pri', 'name', 'status', 'deadline', 'openedDate', 'assignedTo', 'finishedBy', 'finishedDate', 'estimate', 'consumed', 'left', 'story', 'actions'); diff --git a/module/task/control.php b/module/task/control.php index af6f01b464..ffdee7779e 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -145,7 +145,7 @@ class task extends control /* Set Custom*/ foreach(explode(',', $this->config->task->customCreateFields) as $field) $customFields[$field] = $this->lang->task->$field; $this->view->customFields = $customFields; - $this->view->hiddenFields = isset($this->config->task->custom->create) ? $this->config->task->custom->create : ''; + $this->view->showFields = $this->config->task->custom->create; $this->view->title = $title; $this->view->position = $position; diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index edb736558f..b86ec8c9a2 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -42,7 +42,7 @@ - + task->story;?> @@ -64,8 +64,8 @@ @@ -101,9 +101,9 @@ desc, "rows='10' class='form-control'");?>