From 6f10323a8224d05c8c7016dc0313e1dc33074451 Mon Sep 17 00:00:00 2001 From: songchenxuan Date: Mon, 27 Dec 2021 16:14:05 +0800 Subject: [PATCH 01/60] *Finish task #46529. --- module/execution/js/kanban.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index 4411cd3ac7..98efaaeac9 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -39,7 +39,7 @@ function renderUserAvatar(user, objectType, objectID, size) if(objectType == 'story' && !priv.canAssignStory) return $noPrivAvatar; if(objectType == 'bug' && !priv.canAssignBug) return $noPrivAvatar; - return $('').avatar({user: user}); + return $('').avatar({user: user}); } /** From a90fc7c4c040dd48f40a8616ca430201aa22b4cf Mon Sep 17 00:00:00 2001 From: songchenxuan Date: Mon, 27 Dec 2021 16:47:44 +0800 Subject: [PATCH 02/60] *Fix classic mode branch bug. --- module/tree/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/tree/model.php b/module/tree/model.php index 64aaa9aa32..0a81768db4 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -243,7 +243,7 @@ class treeModel extends model { /* If createdVersion <= 4.1, go to getOptionMenu(). */ $products = $this->loadModel('product')->getProductPairsByProject($rootID); - $branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products)); + $branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products), 'noclosed'); if(!$this->isMergeModule($rootID, 'task') or !$products) return $this->getOptionMenu($rootID, 'task', $startModule); From 4dd72bb56b8f55de1a118a07ef49dc9f151e0200 Mon Sep 17 00:00:00 2001 From: songchenxuan Date: Mon, 27 Dec 2021 17:37:42 +0800 Subject: [PATCH 03/60] *Fix classic mode branch bug. --- 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 bbeb913ca5..4e2979347e 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -559,7 +559,7 @@ class bug extends control if($user) $productMembers[$assignedTo] = $user->realname; } - $moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0, $branch === 'all' ? 0 : $branch); + $moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0, ($branch === 'all' or !in_array($branch, array_keys($branches))) ? 0 : $branch); if(empty($moduleOptionMenu)) die(js::locate(helper::createLink('tree', 'browse', "productID=$productID&view=story"))); /* Get products and projects. */ From 03d56f4c19052251e8bca9292c41fb2ba0488b87 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Mon, 27 Dec 2021 18:39:16 +0800 Subject: [PATCH 04/60] * Fix bug: browse stakeholder and link story by plan. --- module/product/view/browse.html.php | 2 +- module/stakeholder/view/browse.html.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 7e3d604ed8..e7ac1c9f64 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -599,7 +599,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; diff --git a/module/stakeholder/view/browse.html.php b/module/stakeholder/view/browse.html.php index 395b4963e2..84a65b8246 100644 --- a/module/stakeholder/view/browse.html.php +++ b/module/stakeholder/view/browse.html.php @@ -14,7 +14,7 @@ stakeholder->confirmDelete);?>