From 1779bdeedcbe01aec5e23015066b49839c43e57b Mon Sep 17 00:00:00 2001 From: wumo Date: Fri, 23 Mar 2018 00:48:54 +0800 Subject: [PATCH 1/4] * Change the object of assigned to. --- module/task/control.php | 2 +- module/task/view/finish.html.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/task/control.php b/module/task/control.php index d380ad317e..716aec9b34 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -789,7 +789,7 @@ class task extends control $task = $this->view->task; $members = $this->loadModel('project')->getTeamMemberPairs($task->project, 'nodeleted'); - $task->nextBy = $task->assignedTo; + $task->nextBy = $task->openedBy; $this->view->users = $members; if(!empty($task->team)) diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php index 78a30bf7ff..74f5736fdc 100644 --- a/module/task/view/finish.html.php +++ b/module/task/view/finish.html.php @@ -38,7 +38,7 @@ team) ? $lang->task->assign : $lang->task->transferTo;?> - openedBy, "class='form-control chosen'");?> + nextBy, "class='form-control chosen'");?> task->finishedDate;?> From ef8e72fc0e79f9b1fefeed4b8489a655685e3877 Mon Sep 17 00:00:00 2001 From: wumo Date: Fri, 23 Mar 2018 04:10:50 +0800 Subject: [PATCH 2/4] * Set the value of deleted product line to 0. --- module/tree/model.php | 1 + module/upgrade/model.php | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/module/tree/model.php b/module/tree/model.php index 5971b0c427..6cb96e74da 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -1396,6 +1396,7 @@ class treeModel extends model $this->fixModulePath($module->root, $module->type); + if($module->type == 'line') $this->dao->update(TABLE_PRODUCT)->set('line')->eq('0')->where('line')->eq($moduleID)->exec(); if($module->type == 'task') $this->dao->update(TABLE_TASK)->set('module')->eq($module->parent)->where('module')->in($childs)->exec(); if($module->type == 'bug') $this->dao->update(TABLE_BUG)->set('module')->eq($module->parent)->where('module')->in($childs)->exec(); if($module->type == 'case') $this->dao->update(TABLE_CASE)->set('module')->eq($module->parent)->where('module')->in($childs)->exec(); diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 4dd59a3924..ab5780e094 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -211,6 +211,7 @@ class upgradeModel extends model $this->execSQL($this->getUpgradeFile('9.8.1')); $this->fixTaskAssignedTo(); $this->fixProjectClosedInfo(); + $this->resetProductLine(); } $this->deletePatch(); @@ -2237,4 +2238,17 @@ class upgradeModel extends model } return !dao::isError(); } + + /** + * Set the value of deleted product line to 0. + * + * @access public + * @return bool + */ + public function resetProductLine() + { + $deletedLines = $this->dao->select('id')->from(TABLE_MODULE)->where('type')->eq('line')->andWhere('deleted')->eq('1')->fetchPairs(); + $this->dao->update(TABLE_PRODUCT)->set('line')->eq(0)->where('line')->in($deletedLines)->exec(); + return !dao::isError(); + } } From bc9224a9597d13c588df721cb704932bebb929df Mon Sep 17 00:00:00 2001 From: wumo Date: Fri, 23 Mar 2018 05:34:34 +0800 Subject: [PATCH 3/4] * Limit the width of parent title. --- module/task/css/batchcreate.css | 6 ++++-- module/task/view/batchcreate.html.php | 12 ++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/module/task/css/batchcreate.css b/module/task/css/batchcreate.css index d09664df48..dcd2569db3 100644 --- a/module/task/css/batchcreate.css +++ b/module/task/css/batchcreate.css @@ -8,7 +8,9 @@ .chosen-container[id^="story"] .chosen-drop {min-width: 450px;!important} .chosen-container[id^="module"] .chosen-drop {min-width: 400px;!important} -#zeroTaskStory{background-color: #fafafa; color: #808080; padding: 5px 8px; text-align: center; margin-left: 10px; border: 1px solid #ddd; } +#zeroTaskStory{background-color: #fafafa; color: #808080; padding: 5px 8px; text-align: center; margin-left: 10px; border: 1px solid #ddd;} #zeroTaskStory .icon{display:none;} -#zeroTaskStory.zeroTask {background-color: #114f8e; color: #fff; border-color: #114f8e; } +#zeroTaskStory.zeroTask {background-color: #114f8e; color: #fff; border-color: #114f8e;} #zeroTaskStory.zeroTask .icon{display:inline;} + +.heading .pull-left {width: 200px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index 525059619a..2f85283b83 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -15,8 +15,16 @@
icons['task']);?> - icons['batchCreate']);?> task->batchCreateChildren : $lang->task->batchCreate;?> - type != 'ops'):?>story->zeroTask;?> + + icons['batchCreate']);?> + + + task->batchCreateChildren;?> + + task->batchCreate;?> + + + type != 'ops'):?>story->zeroTask;?>
pasteText, "data-toggle='myModal'", 'btn btn-primary')?> From a8e8c79660a519399cc28cfa288433d64aae5768 Mon Sep 17 00:00:00 2001 From: wumo Date: Fri, 23 Mar 2018 05:48:24 +0800 Subject: [PATCH 4/4] * Adjust the style. --- module/task/css/batchcreate.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/css/batchcreate.css b/module/task/css/batchcreate.css index dcd2569db3..108582d3fc 100644 --- a/module/task/css/batchcreate.css +++ b/module/task/css/batchcreate.css @@ -13,4 +13,4 @@ #zeroTaskStory.zeroTask {background-color: #114f8e; color: #fff; border-color: #114f8e;} #zeroTaskStory.zeroTask .icon{display:inline;} -.heading .pull-left {width: 200px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} +.heading .pull-left {max-width: 200px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}