From ea1b08905ce6b898264991f9b58693b5790faba7 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Fri, 9 Sep 2022 08:19:44 +0800 Subject: [PATCH 01/13] * Fix bug#27124. --- module/task/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/control.php b/module/task/control.php index c847bc4a05..ec0881ee7e 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -230,7 +230,7 @@ class task extends control elseif($this->post->after == 'toTaskList') { setcookie('moduleBrowseParam', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false); - $taskLink = $this->createLink('execution', 'task', "executionID=$executionID&status=all¶m=0&orderBy=id_desc"); + $taskLink = $this->createLink('execution', 'task', "executionID=$executionID&status=unclosed¶m=0&orderBy=id_desc"); $response['locate'] = $taskLink; return $this->send($response); } From adb25f92b34f231dfc664a9164fe7466ea1eaa21 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 9 Sep 2022 09:55:42 +0800 Subject: [PATCH 02/13] * Fix bug #27296. --- module/task/js/create.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/js/create.js b/module/task/js/create.js index 0a65fc34c3..839ac331ed 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -97,7 +97,7 @@ function loadExecutionMembers(executionID) */ function loadExecutionStories(executionID) { - $.get(createLink('story', 'ajaxGetExecutionStories', 'executionID=' + executionID + '&productID=0&branch=0&moduleID=0&storyID=' + $('#story').val()), function(data) + $.get(createLink('story', 'ajaxGetExecutionStories', 'executionID=' + executionID + '&productID=0&branch=0&moduleID=0&storyID=' + $('#story').val() + '&number=&type=full&status=active'), function(data) { $('#story_chosen').remove(); $('#story').next('.picker').remove(); From 490c0f8791d45d36b2643a5af8da273b00d4cb47 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 9 Sep 2022 10:10:17 +0800 Subject: [PATCH 03/13] * Fix bug #27281. --- module/doc/css/createbasicinfo.css | 1 + module/doc/css/tablecontents.css | 2 +- module/doc/view/createbasicinfo.html.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/doc/css/createbasicinfo.css b/module/doc/css/createbasicinfo.css index a6a00155ce..0c0e796ae6 100644 --- a/module/doc/css/createbasicinfo.css +++ b/module/doc/css/createbasicinfo.css @@ -1 +1,2 @@ #whiteListBox .input-group:last-child {margin-top: 10px;} +#module_chosen.chosen-container .chosen-results {max-height: 200px;} diff --git a/module/doc/css/tablecontents.css b/module/doc/css/tablecontents.css index 01fc3e2ab6..8e12dc7d0f 100644 --- a/module/doc/css/tablecontents.css +++ b/module/doc/css/tablecontents.css @@ -9,7 +9,7 @@ .no-content-button a:nth-child(2) {margin-left: 20px;} .cell .detail .detail-title {padding-left: 5px; list-style: none;} -.menu-actions {position: relative; float: right; top: -34px; right: -15px; padding: 7px 8px;} +.menu-actions {position: absolute; top: 7px; right: 45px; padding: 7px 8px;} .detail ul {position: relative;} .tail-info {position: absolute; right: 0; padding-left: 10px; padding-top: 1px;} .tail-info, .doc-title, span.item {background: #fff;} diff --git a/module/doc/view/createbasicinfo.html.php b/module/doc/view/createbasicinfo.html.php index 165e6ce5b0..31a1fa7736 100644 --- a/module/doc/view/createbasicinfo.html.php +++ b/module/doc/view/createbasicinfo.html.php @@ -31,7 +31,7 @@ doc->module;?> - + From e9efb567692a33420c619447e0ce5dd8671b97d1 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 9 Sep 2022 10:37:28 +0800 Subject: [PATCH 04/13] * Fix bug #27437. --- module/bug/lang/de.php | 5 +++-- module/bug/lang/en.php | 5 +++-- module/bug/lang/fr.php | 5 +++-- module/bug/lang/zh-cn.php | 3 ++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/module/bug/lang/de.php b/module/bug/lang/de.php index 6925197c5b..92c7f5d4fb 100644 --- a/module/bug/lang/de.php +++ b/module/bug/lang/de.php @@ -187,10 +187,11 @@ $lang->bug->allUsers = 'Alle Benutzer laden'; $lang->bug->allBuilds = 'Alle'; $lang->bug->createBuild = 'Neu'; -/* Legend list。*/ +global $config; +/* Legend list. */ $lang->bug->legendBasicInfo = 'Basis Info'; $lang->bug->legendAttatch = 'Anlagen'; -$lang->bug->legendPRJExecStoryTask = 'Project/' . $lang->executionCommon . '/Story/Task'; +$lang->bug->legendPRJExecStoryTask = $config->systemMode == 'new' ? 'Project/' . $lang->executionCommon . '/Story/Task' : $lang->executionCommon . '/Story/Task'; $lang->bug->legendExecStoryTask = $lang->executionCommon . '/Story/Task'; $lang->bug->lblTypeAndSeverity = 'Typ/Schwere'; $lang->bug->lblSystemBrowserAndHardware = 'System/Browser'; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 8a14403c90..439690a04f 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -187,10 +187,11 @@ $lang->bug->allUsers = 'Load All Users'; $lang->bug->allBuilds = 'All Builds'; $lang->bug->createBuild = 'New'; -/* Legend list。*/ +global $config; +/* Legend list. */ $lang->bug->legendBasicInfo = 'Basic Info'; $lang->bug->legendAttatch = 'Files'; -$lang->bug->legendPRJExecStoryTask = 'Project/' . $lang->executionCommon . '/Story/Task'; +$lang->bug->legendPRJExecStoryTask = $config->systemMode == 'new' ? 'Project/' . $lang->executionCommon . '/Story/Task' : $lang->executionCommon . '/Story/Task'; $lang->bug->legendExecStoryTask = $lang->executionCommon . '/Story/Task'; $lang->bug->lblTypeAndSeverity = 'Type/Severity'; $lang->bug->lblSystemBrowserAndHardware = 'System/Browser'; diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php index f23542c7ef..de0bfd7c05 100644 --- a/module/bug/lang/fr.php +++ b/module/bug/lang/fr.php @@ -187,10 +187,11 @@ $lang->bug->allUsers = 'Charger Tous'; $lang->bug->allBuilds = 'Tous les Builds'; $lang->bug->createBuild = 'Nouveau'; -/* Legend list。*/ +global $config; +/* Legend list. */ $lang->bug->legendBasicInfo = 'Infos de Base'; $lang->bug->legendAttatch = 'Fichiers'; -$lang->bug->legendPRJExecStoryTask = 'Project/' . $lang->executionCommon . '/Story/Task'; +$lang->bug->legendPRJExecStoryTask = $config->systemMode == 'new' ? 'Project/' . $lang->executionCommon . '/Story/Task' : $lang->executionCommon . '/Story/Task'; $lang->bug->legendExecStoryTask = $lang->executionCommon . '/Story/Tâche'; $lang->bug->lblTypeAndSeverity = 'Type/Severité'; $lang->bug->lblSystemBrowserAndHardware = 'Système/Browser'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 719ba107c1..cab71d93d5 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -187,10 +187,11 @@ $lang->bug->allUsers = '加载所有用户'; $lang->bug->allBuilds = '所有'; $lang->bug->createBuild = '创建'; +global $config; /* legend列表。*/ $lang->bug->legendBasicInfo = '基本信息'; $lang->bug->legendAttatch = '附件'; -$lang->bug->legendPRJExecStoryTask = "项目/" . $lang->executionCommon . "/{$lang->SRCommon}/任务"; +$lang->bug->legendPRJExecStoryTask = $config->systemMode == 'new' ? "项目/" . $lang->executionCommon . "/{$lang->SRCommon}/任务" : $lang->executionCommon . "/{$lang->SRCommon}/任务"; $lang->bug->legendExecStoryTask = $lang->executionCommon . "/{$lang->SRCommon}/任务"; $lang->bug->lblTypeAndSeverity = '类型/严重程度'; $lang->bug->lblSystemBrowserAndHardware = '系统/浏览器'; From 40bc0e79662c4fb7ceb817d379aadd3b9f5a19b4 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Fri, 9 Sep 2022 11:17:37 +0800 Subject: [PATCH 05/13] * Fix bug#26942. --- module/story/control.php | 9 ++++++++- module/story/lang/de.php | 1 + module/story/lang/en.php | 1 + module/story/lang/fr.php | 1 + module/story/lang/vi.php | 1 + module/story/lang/zh-cn.php | 1 + 6 files changed, 13 insertions(+), 1 deletion(-) diff --git a/module/story/control.php b/module/story/control.php index b29572e3e1..16b4b7158b 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -1858,11 +1858,18 @@ class story extends control $storyGroup = array(); foreach($stories as $story) { - if(strpos('draft,reviewing,changing,closed', $story->status) !== false) continue; + if(strpos('draft,reviewing,changing,closed', $story->status) !== false) + { + unset($stories[$story->id]); + continue; + } + if(isset($storyGroup[$story->module])) continue; $storyGroup[$story->module] = $this->story->getExecutionStoryPairs($executionID, 0, 'all', $story->module, 'short', 'active'); } + if(empty($stories)) return print(js::error($this->lang->story->noStoryToTask) . js::locate($this->session->storyList)); + $this->view->title = $this->lang->story->batchToTask; $this->view->executionID = $executionID; $this->view->syncFields = empty($_POST['fields']) ? array() : $_POST['fields']; diff --git a/module/story/lang/de.php b/module/story/lang/de.php index 4dc37b3253..b4fd31b40c 100644 --- a/module/story/lang/de.php +++ b/module/story/lang/de.php @@ -307,6 +307,7 @@ $lang->story->confirmChangePlan = $lang->SRCommon . ' %s is linked to the bra $lang->story->errorDuplicateStory = $lang->SRCommon . '%s not exist'; $lang->story->confirmRecallChange = "After undo the change, the story content will revert to the version before the change. Are you sure you want to undo?"; $lang->story->confirmRecallReview = "Are you sure you want to withdraw the review?"; +$lang->story->noStoryToTask = "Only the activated {$lang->SRCommon} can be converted into a task!"; $lang->story->form = new stdclass(); $lang->story->form->area = 'Story Bereich'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 07a0fea7d6..eaf61f59dd 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -307,6 +307,7 @@ $lang->story->confirmChangePlan = $lang->SRCommon . ' %s is linked to the bra $lang->story->errorDuplicateStory = $lang->SRCommon . '%s not exist'; $lang->story->confirmRecallChange = "After undo the change, the story content will revert to the version before the change. Are you sure you want to undo?"; $lang->story->confirmRecallReview = "Are you sure you want to withdraw the review?"; +$lang->story->noStoryToTask = "Only the activated {$lang->SRCommon} can be converted into a task!"; $lang->story->form = new stdclass(); $lang->story->form->area = 'Scope'; diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php index 529500b906..d0bff1b1f6 100644 --- a/module/story/lang/fr.php +++ b/module/story/lang/fr.php @@ -307,6 +307,7 @@ $lang->story->confirmChangePlan = $lang->SRCommon . ' %s is linked to the bra $lang->story->errorDuplicateStory = $lang->SRCommon . '%s not exist'; $lang->story->confirmRecallChange = "After undo the change, the story content will revert to the version before the change. Are you sure you want to undo?"; $lang->story->confirmRecallReview = "Are you sure you want to withdraw the review?"; +$lang->story->noStoryToTask = "Only the activated {$lang->SRCommon} can be converted into a task!"; $lang->story->form = new stdclass(); $lang->story->form->area = 'Périmètre'; diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php index b21627c2cf..e92b3a8b0c 100644 --- a/module/story/lang/vi.php +++ b/module/story/lang/vi.php @@ -299,6 +299,7 @@ $lang->story->confirmChangePlan = $lang->SRCommon . ' %s is linked to the bra $lang->story->errorDuplicateStory = $lang->SRCommon . '%s not exist'; $lang->story->confirmRecallChange = "After undo the change, the story content will revert to the version before the change. Are you sure you want to undo?"; $lang->story->confirmRecallReview = "Are you sure you want to withdraw the review?"; +$lang->story->noStoryToTask = "Only the activated {$lang->SRCommon} can be converted into a task!"; $lang->story->form = new stdclass(); $lang->story->form->area = 'Phạm vi'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 3448bbfdc9..b33b955e51 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -307,6 +307,7 @@ $lang->story->confirmChangePlan = $lang->SRCommon . '%s已关联在之前计 $lang->story->errorDuplicateStory = $lang->SRCommon . '%s不存在'; $lang->story->confirmRecallChange = "撤销变更后，需求内容会回退至变更前的版本，您确定要撤销吗？"; $lang->story->confirmRecallReview = "您确定要撤回评审吗？"; +$lang->story->noStoryToTask = "只有激活的{$lang->SRCommon}才能转为任务！"; $lang->story->form = new stdclass(); $lang->story->form->area = "该{$lang->SRCommon}所属范围"; From 981aaf5755ce1a06ec505cf3f52ef6c53a73f7fa Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Fri, 9 Sep 2022 11:24:04 +0800 Subject: [PATCH 06/13] * Fix bug#26874. --- module/product/view/ajaxgetdropmenu.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php index dab16dd063..81b430e4d9 100644 --- a/module/product/view/ajaxgetdropmenu.html.php +++ b/module/product/view/ajaxgetdropmenu.html.php @@ -26,7 +26,7 @@ #swapper .tree li>.list-toggle {top: -1px;} #subHeader .tree ul {display: block;} -#closed {width: 90px; height: 25px; line-height: 25px; background-color: #ddd; color: #3c495c; text-align: center; margin-left: 15px; border-radius: 2px;} +div#closed {width: 90px; height: 25px; line-height: 25px; background-color: #ddd; color: #3c495c; text-align: center; margin-left: 15px; border-radius: 2px;} #gray-line {width: 230px; height: 1px; margin-left: 10px; margin-bottom:2px; background-color: #ddd;} #swapper li >.selected {color: #0c64eb!important;background: #e9f2fb!important;} From 8fe84e651fbc6cc9ee05d6cdb39ccb8a66b1f856 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Fri, 9 Sep 2022 13:23:09 +0800 Subject: [PATCH 07/13] * Modify submit review icon. --- extension/lite/story/ext/view/view.html.php | 4 ++-- module/my/view/requirement.html.php | 4 ++-- module/my/view/story.html.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extension/lite/story/ext/view/view.html.php b/extension/lite/story/ext/view/view.html.php index fb971c4d9f..df7df73062 100644 --- a/extension/lite/story/ext/view/view.html.php +++ b/extension/lite/story/ext/view/view.html.php @@ -110,7 +110,7 @@ common::printIcon('story', 'change', "storyID=$child->id", $child, 'list', 'alter'); if(strpos('draft,changing', $child->status) !== false) { - common::printIcon('story', 'submitReview', "storyID=$child->id", $child, 'list', 'sub-review', '', 'iframe showinonlybody', true); + common::printIcon('story', 'submitReview', "storyID=$child->id", $child, 'list', 'confirm', '', 'iframe showinonlybody', true); } else { @@ -143,7 +143,7 @@ common::printIcon('story', 'change', "storyID=$story->id", $story, 'button', 'alter', '', 'showinonlybody'); if(strpos('draft,changing', $story->status) !== false) { - common::printIcon('story', 'submitReview', "storyID=$story->id", $story, 'button', 'sub-review', '', 'iframe showinonlybody', true); + common::printIcon('story', 'submitReview', "storyID=$story->id", $story, 'button', 'confirm', '', 'iframe showinonlybody', true); } else { diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php index 8472470c53..37248276c6 100644 --- a/module/my/view/requirement.html.php +++ b/module/my/view/requirement.html.php @@ -107,7 +107,7 @@ if(strpos('draft,changing', $story->status) !== false) { - echo common::buildIconButton('story', 'submitReview', "$vars&storyType=requirement", $story, 'list', 'sub-review', '', 'iframe', true); + echo common::buildIconButton('story', 'submitReview', "$vars&storyType=requirement", $story, 'list', 'confirm', '', 'iframe', true); } else { @@ -155,7 +155,7 @@ if(strpos('draft,changing', $child->status) !== false) { - common::printIcon('story', 'submitReview', "$vars&storyType=story", $child, 'list', 'sub-review', '', 'iframe', true); + common::printIcon('story', 'submitReview', "$vars&storyType=story", $child, 'list', 'confirm', '', 'iframe', true); } else { diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index e19a82ece3..b309858436 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -108,7 +108,7 @@ if(strpos('draft,changing', $story->status) !== false) { - echo common::buildIconButton('story', 'submitReview', $vars, $story, 'list', 'sub-review', '', 'iframe', true); + echo common::buildIconButton('story', 'submitReview', $vars, $story, 'list', 'confirm', 'confirm', 'iframe', true); } else { @@ -158,7 +158,7 @@ if(strpos('draft,changing', $child->status) !== false) { - common::printIcon('story', 'submitReview', $vars, $child, 'list', 'sub-review', '', 'iframe', true); + common::printIcon('story', 'submitReview', $vars, $child, 'list', 'confirm', '', 'iframe', true); } else { From a258b7b9db6660a7446a6114d0e4246d64305785 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Fri, 9 Sep 2022 14:11:36 +0800 Subject: [PATCH 08/13] * Fix bug#26156. --- module/bug/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/bug/control.php b/module/bug/control.php index 66a0585929..14e5cf7de2 100755 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -525,7 +525,7 @@ class bug extends control $severity = $bug->severity; $type = $bug->type; $assignedTo = $bug->assignedTo; - $deadline = $bug->deadline; + $deadline = helper::isZeroDate($bug->deadline) ? '' : $bug->deadline; $color = $bug->color; $testtask = $bug->testtask; if($pri == 0) $pri = '3'; From dfe4de62a578f8cf260e21ee860ac2f76ee58aaf Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Fri, 9 Sep 2022 14:14:53 +0800 Subject: [PATCH 09/13] * Fix bug#26179. --- module/bug/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/bug/model.php b/module/bug/model.php index 593bd21324..dbb79b8230 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -3279,7 +3279,7 @@ class bugModel extends model $title = "title='" . zget($projectPairs, $bug->project, '') . "'"; break; case 'plan': - $title = "title='" . zget($plans, $bug->plan) . "'"; + $title = "title='" . zget($plans, $bug->plan, '') . "'"; break; case 'execution': $title = "title='" . zget($executions, $bug->execution) . "'"; From 9f28ebf56b915c7765fab1635d6e1bccd4f9e847 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Fri, 9 Sep 2022 14:27:18 +0800 Subject: [PATCH 10/13] * Fix bug#26180. --- module/build/view/linkstory.html.php | 2 +- module/build/view/view.html.php | 2 +- module/projectrelease/view/linkstory.html.php | 2 +- module/projectrelease/view/view.html.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php index 9700032238..7bf64d0c76 100644 --- a/module/build/view/linkstory.html.php +++ b/module/build/view/linkstory.html.php @@ -47,7 +47,7 @@ story->priList, $story->pri, $story->pri)?> parent > 0) echo "{$lang->story->childrenAB}"; + if($story->parent > 0) echo "{$lang->story->childrenAB}"; echo html::a($this->createLink('story', 'view', "storyID=$story->id&version=0¶m=$objectID", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'"); ?> diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index ea39390fb3..d1f39416fd 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -103,7 +103,7 @@ tbody tr td:first-child input {display: none;} story->priList, $story->pri, $story->pri);?> parent > 0) echo "{$lang->story->childrenAB}"; + if($story->parent > 0) echo "{$lang->story->childrenAB}"; if($this->app->tab == 'execution' and common::hasPriv('execution', 'storyView')) { echo html::a($this->createLink('execution', 'storyView', "storyID=$story->id", '', true), $story->title, '', isonlybody() ? "data-width='1000'" : "class='iframe' data-width='1000'"); diff --git a/module/projectrelease/view/linkstory.html.php b/module/projectrelease/view/linkstory.html.php index 2d37e27b1c..36f169da5f 100644 --- a/module/projectrelease/view/linkstory.html.php +++ b/module/projectrelease/view/linkstory.html.php @@ -50,7 +50,7 @@ pri;?>' title='story->priList, $story->pri)?>'>story->priList, $story->pri)?> parent > 0) echo "{$lang->story->childrenAB}"; + if($story->parent > 0) echo "{$lang->story->childrenAB}"; echo html::a($this->createLink('story', 'view', "storyID={$story->id}&version=0¶m=$projectID", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'"); ?> diff --git a/module/projectrelease/view/view.html.php b/module/projectrelease/view/view.html.php index 9ac0487fc3..70378c16b2 100644 --- a/module/projectrelease/view/view.html.php +++ b/module/projectrelease/view/view.html.php @@ -94,7 +94,7 @@ pri;?>' title='story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> parent > 0) echo "{$lang->story->childrenAB}"; + if($story->parent > 0) echo "{$lang->story->childrenAB}"; echo html::a($storyLink,$story->title, '', "class='preview'"); ?> From 4d439f7337047ee4f9ea2840f6c8116cd680801c Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Fri, 9 Sep 2022 14:33:29 +0800 Subject: [PATCH 11/13] * Fix bug#26180. --- module/execution/view/linkstory.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/execution/view/linkstory.html.php b/module/execution/view/linkstory.html.php index 80e97dbfde..29bf65c18d 100644 --- a/module/execution/view/linkstory.html.php +++ b/module/execution/view/linkstory.html.php @@ -66,7 +66,7 @@ pri;?>' title='story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> parent > 0) echo "{$lang->story->childrenAB}"; + if($story->parent > 0) echo "{$lang->story->childrenAB}"; if(common::hasPriv('execution', 'storyView')) { echo html::a($storyLink, $story->title, '', "class='iframe' data-width='80%'"); From abffa486a1dbe37ff83b73110b3545f749781fc0 Mon Sep 17 00:00:00 2001 From: sunguangming Date: Fri, 9 Sep 2022 14:51:41 +0800 Subject: [PATCH 12/13] * Fix bug #27442. --- module/task/view/batchedit.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index 611ddbb728..d220b44399 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -99,8 +99,8 @@ js::set('requiredFields', $config->task->edit->requiredFields); $taskMembers = array(); if(isset($teams[$taskID])) { - $teamAccounts = array_keys($teams[$taskID]); - foreach($teamAccounts as $teamAccount) $taskMembers[$teamAccount] = $users[$teamAccount]; + $teamAccounts = $teams[$taskID]; + foreach($teamAccounts as $teamAccount) $taskMembers[$teamAccount->account] = $users[$teamAccount->account]; } else { From f7883bf7b736a5aad795aaba8b98a0cced354104 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Fri, 9 Sep 2022 15:08:06 +0800 Subject: [PATCH 13/13] * Fix bug#26350. --- module/story/view/create.html.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index b035884158..856bc23ffe 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -11,9 +11,6 @@ */ ?> - story->placeholder); ?>