From 4b6f98f3cc8f880e57dd43ecaef5fd330147bcf3 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Wed, 14 Apr 2021 10:10:54 +0800 Subject: [PATCH 1/7] * Fix bug #6952. --- module/task/control.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/module/task/control.php b/module/task/control.php index 3e01190019..8cb3656512 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -1567,6 +1567,18 @@ class task extends control if(isset($users[$task->closedBy])) $task->closedBy = $users[$task->closedBy]; if(isset($users[$task->lastEditedBy])) $task->lastEditedBy = $users[$task->lastEditedBy]; + /* Convert username to real name. */ + if(!empty($task->mailto)) + { + $mailtoList = explode(',', $task->mailto); + + $task->mailto = ''; + foreach($mailtoList as $mailto) + { + if(!empty($mailto)) $task->mailto .= ',' . zget($users, $mailto); + } + } + if($task->parent > 0 && strpos($task->name, htmlentities('>')) !== 0) $task->name = '>' . $task->name; if(!empty($task->team)) $task->name = '[' . $taskLang->multipleAB . '] ' . $task->name; From 6dc7aa8f58b5bb145b10cadd19e17800914dc086 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 14 Apr 2021 10:12:51 +0800 Subject: [PATCH 2/7] * Fix doc link. --- module/doc/view/index.html.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php index 47555a9600..cb6a9588dd 100644 --- a/module/doc/view/index.html.php +++ b/module/doc/view/index.html.php @@ -21,7 +21,7 @@
doc->orderByEdit;?>
@@ -127,7 +127,7 @@
doc->myDoc;?>
@@ -159,7 +159,7 @@
doc->myCollection;?>
From 068411733ce5d2ed016dbd73c597cc748b23c388 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Wed, 14 Apr 2021 10:36:11 +0800 Subject: [PATCH 3/7] * Fix bug #11060. --- module/story/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/story/model.php b/module/story/model.php index 1dec807d88..82bab545ac 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -526,7 +526,7 @@ class storyModel extends model $story = fixer::input('post') ->callFunc('title', 'trim') ->setDefault('lastEditedBy', $this->app->user->account) - ->setDefault('lastEditedDate', $now) + ->add('lastEditedDate', $now) ->setIF($this->post->assignedTo == '', 'assignedTo', $oldStory->assignedTo) ->setIF($this->post->assignedTo != '' and $this->post->assignedTo != $oldStory->assignedTo, 'assignedDate', $now) ->setIF($specChanged, 'version', $oldStory->version + 1) From 5d74fc96d26da990a390727dc9ef2b3d77872cfd Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Wed, 14 Apr 2021 10:46:54 +0800 Subject: [PATCH 4/7] * Fix bug #12030. --- module/product/control.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/module/product/control.php b/module/product/control.php index 771f5fd543..08a467b743 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -340,6 +340,10 @@ class product extends control $rdUsers = $this->user->getPairs('nodeleted|devfirst|noclosed', '', $this->config->maxCount); if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink; + $lines = array(); + if($programID) $lines = array('') + $this->product->getLinePairs($programID); + if($this->config->systemMode == 'classic') $lines = array('') + $this->product->getLinePairs(); + $this->view->title = $this->lang->product->create; $this->view->position[] = $this->view->title; $this->view->groups = $this->loadModel('group')->getPairs(); @@ -349,7 +353,7 @@ class product extends control $this->view->rdUsers = $rdUsers; $this->view->users = $this->user->getPairs('nodeleted|noclosed'); $this->view->programs = array('') + $this->loadModel('program')->getTopPairs('', 'noclosed'); - $this->view->lines = $this->config->systemMode == 'new' ? array() : array('' => '') + $this->product->getLinePairs(); + $this->view->lines = $lines; $this->view->URSRPairs = $this->loadModel('custom')->getURSRPairs(); unset($this->lang->product->typeList['']); From 941304aae6130019c5ce475e038fa25ffd74b827 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Wed, 14 Apr 2021 10:51:26 +0800 Subject: [PATCH 5/7] * Fix bug#11371. --- module/story/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/story/model.php b/module/story/model.php index 82bab545ac..413fc6c928 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -2743,7 +2743,7 @@ class storyModel extends model } elseif($type == 'full') { - $property = '(' . $this->lang->story->pri . ':' . (!empty($this->lang->story->priList[$story->pri]) ? $this->lang->story->priList[$story->pri] : 0) . ',' . $this->lang->story->estimate . ':' . $this->lang->hourCommon . ')'; + $property = '(' . $this->lang->story->pri . ':' . (!empty($this->lang->story->priList[$story->pri]) ? $this->lang->story->priList[$story->pri] : 0) . ',' . $this->lang->story->estimate . ':' . $story->estimate . ')'; } else { From 5c810f2420702b8dd244124c1a37b40af77afa97 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Wed, 14 Apr 2021 11:18:29 +0800 Subject: [PATCH 6/7] * Fix bug #11005. --- module/bug/view/batchedit.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php index 6950477e3e..0cd8db28cf 100644 --- a/module/bug/view/batchedit.html.php +++ b/module/bug/view/batchedit.html.php @@ -49,7 +49,7 @@ idAB;?> '>bug->type;?> - '>bug->severityAB;?> + '>bug->severity;?> '>bug->pri;?> bug->title;?> From 20be4489cbca54d49ddfda42f8f523d28c7c29c8 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 14 Apr 2021 11:19:13 +0800 Subject: [PATCH 7/7] * Fix bug #11797. --- module/task/model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/task/model.php b/module/task/model.php index 8708321c9f..24199b3356 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1490,6 +1490,7 @@ class taskModel extends model $data->status = $task->status; $data->lastEditedBy = $this->app->user->account; $data->lastEditedDate = $now; + if(helper::isZeroDate($task->realStarted)) $data->realStarted = $now; if($left == 0) {