From 0344580fff3047c075cc8a7148c1dafe7e658d1e Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 22 Mar 2019 10:42:00 +0800 Subject: [PATCH 1/8] * Fix task lang file. --- module/task/view/view.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index 83e46c070d..c4d7931499 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -247,7 +247,7 @@ - team) ? $lang->task->assignTo : $lang->task->transferTo;?> + task->assignedTo;?> assignedTo ? $task->assignedToRealName . $lang->at . $task->assignedDate : $lang->noData;?> From 0e0f0af55536448c7d1ce7c38d2ab9ac079191e1 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 22 Mar 2019 11:19:44 +0800 Subject: [PATCH 2/8] * Finish child task. --- module/task/lang/en.php | 1 - module/task/lang/zh-cn.php | 1 - module/task/model.php | 4 ++-- module/task/view/edit.html.php | 8 +------- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 4f9f5a52d0..da4a540524 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -106,7 +106,6 @@ $lang->task->team = 'Team'; $lang->task->transfer = 'Transfer'; $lang->task->transferTo = 'Transfer To'; $lang->task->children = 'Child Task'; -$lang->task->unlinkParent = 'Unlink Parent'; $lang->task->childrenAB = 'Child'; $lang->task->parent = 'Parent Task'; $lang->task->parentAB = 'Parent Task'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 2945efd2ff..a4ba48d715 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -106,7 +106,6 @@ $lang->task->team = '团队'; $lang->task->transfer = '转交'; $lang->task->transferTo = '转交给'; $lang->task->children = '子任务'; -$lang->task->unlinkParent = '取消子任务'; $lang->task->childrenAB = '子'; $lang->task->parent = '父任务'; $lang->task->parentAB = '父'; diff --git a/module/task/model.php b/module/task/model.php index e5c00ca837..83ed72097d 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -655,13 +655,13 @@ class taskModel extends model ->setIF($this->post->assignedTo != $oldTask->assignedTo, 'assignedDate', $now) ->setIF($this->post->status == 'wait' and $this->post->left == $oldTask->left and $this->post->consumed == 0 and $this->post->estimate, 'left', $this->post->estimate) - ->setIF(isset($_POST['unlinkParent']), 'parent', 0) + ->setIF($oldTask->parent > 0 and !$this->post->parent, 'parent', 0) ->setDefault('lastEditedBy', $this->app->user->account) ->add('lastEditedDate', $now) ->stripTags($this->config->task->editor->edit['id'], $this->config->allowedTags) ->join('mailto', ',') - ->remove('comment,files,labels,uid,multiple,team,teamEstimate,teamConsumed,teamLeft,contactListMenu,unlinkParent') + ->remove('comment,files,labels,uid,multiple,team,teamEstimate,teamConsumed,teamLeft,contactListMenu') ->get(); if($task->consumed < $oldTask->consumed) die(js::error($this->lang->task->error->consumedSmall)); diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index b588ea1f19..99e5eeb29c 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -103,18 +103,12 @@ story, "class='form-control chosen'");?> - parent == 0 and empty($task->team)):?> + parent >= 0 and empty($task->team)):?> task->parent;?> parent, "class='form-control chosen'");?> - parent > 0):?> - - task->unlinkParent;?> - - - task->assignedTo;?> assignedTo, "class='form-control chosen'");?> From be952195ce5193859d6107403e447aa327213a6f Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 22 Mar 2019 13:02:03 +0800 Subject: [PATCH 3/8] * Fix burn select width. --- module/project/view/burn.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/project/view/burn.html.php b/module/project/view/burn.html.php index 84b3303dce..d499d1f5f7 100644 --- a/module/project/view/burn.html.php +++ b/module/project/view/burn.html.php @@ -25,7 +25,7 @@ echo $lang->project->howToUpdateBurn; ?> -
+
'>
From 955bbf3345e88674c36cbf425b9f1f2a007dcdee Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 22 Mar 2019 13:08:23 +0800 Subject: [PATCH 4/8] * Fix block lang file. --- module/block/view/dashboard.html.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php index 2631fcc085..c820e1cfec 100644 --- a/module/block/view/dashboard.html.php +++ b/module/block/view/dashboard.html.php @@ -44,13 +44,13 @@ $useGuest = $this->app->user->account == 'guest';
    • From 50eea70d0104ac328bb73a04ef06c71f2015a33d Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 22 Mar 2019 15:23:56 +0800 Subject: [PATCH 8/8] * Fix project task button. --- module/project/view/task.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php index 40de7961c6..7a5ce4b66a 100644 --- a/module/project/view/task.html.php +++ b/module/project/view/task.html.php @@ -149,7 +149,7 @@ js::set('browseType', $browseType); project = $projectID; - if(!isset($this->config->isINT) or !$this->config->isINT) + if(!isset($this->config->isINT) or !$this->config->isINT or $this->app->getClientLang() != 'en') { $link = $this->createLink('task', 'batchCreate', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')); if(common::hasPriv('task', 'batchCreate', $checkObject)) echo html::a($link, " {$lang->task->batchCreate}", '', "class='btn btn btn-secondary'"); @@ -158,7 +158,7 @@ js::set('browseType', $browseType); $link = $this->createLink('task', 'create', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')); if(common::hasPriv('task', 'create', $checkObject)) echo html::a($link, " {$lang->task->create}", '', "class='btn btn-primary'"); ?> - config->isINT) and $this->config->isINT):?> + config->isINT) and $this->config->isINT and $this->app->getClientLang() == 'en'):?> createLink('task', 'batchCreate', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : ''));?>