From fd1868a287a5850eb222c4bba34c18f6a5a646f2 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 27 Jul 2022 16:22:07 +0800 Subject: [PATCH 1/7] * Fix bug #25465. --- module/bug/control.php | 5 +++-- module/bug/js/common.js | 15 +++++++++++---- module/bug/view/edit.html.php | 1 + 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/module/bug/control.php b/module/bug/control.php index 53bd69e118..81c5d74116 100755 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -2254,12 +2254,13 @@ class bug extends control * AJAX: get all users as assignedTo list. * * @param string $selectedUser + * @param string $params noletter|noempty|nodeleted|noclosed|withguest|pofirst|devfirst|qafirst|pmfirst|realname|outside|inside|all, can be sets of theme * @access public * @return string */ - public function ajaxLoadAllUsers($selectedUser = '') + public function ajaxLoadAllUsers($selectedUser = '', $params = 'devfirst|noclosed') { - $allUsers = $this->loadModel('user')->getPairs('devfirst|noclosed'); + $allUsers = $this->loadModel('user')->getPairs($params); return print(html::select('assignedTo', $allUsers, $selectedUser, 'class="form-control"')); } diff --git a/module/bug/js/common.js b/module/bug/js/common.js index d754ff9b23..2fe4c691ce 100644 --- a/module/bug/js/common.js +++ b/module/bug/js/common.js @@ -60,14 +60,21 @@ function loadAll(productID) */ function loadAllUsers() { - var link = createLink('bug', 'ajaxLoadAllUsers', 'selectedUser=' + $('#assignedTo').val()); + isClosedBug = typeof isClosedBug == 'undefined' ? false : isClosedBug; + + var params = isClosedBug ? '¶ms=devfirst' : ''; + var link = createLink('bug', 'ajaxLoadAllUsers', 'selectedUser=' + $('#assignedTo').val() + params); $.get(link, function(data) { if(data) { - var moduleID = $('#module').val(); - var productID = $('#product').val(); - setAssignedTo(moduleID, productID); + if(!isClosedBug) + { + var moduleID = $('#module').val(); + var productID = $('#product').val(); + setAssignedTo(moduleID, productID); + } + $('#assignedTo').replaceWith(data); $('#assignedTo_chosen').remove(); $('#assignedTo').chosen(); diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index 34330d2e23..94596414f9 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -28,6 +28,7 @@ js::set('systemMode' , $config->systemMode); js::set('confirmUnlinkBuild' , sprintf($lang->bug->confirmUnlinkBuild, zget($resolvedBuilds, $bug->resolvedBuild))); js::set('tab' , $this->app->tab); js::set('bugBranch' , $bug->branch); +js::set('isClosedBug' , $bug->status == 'closed'); if($this->app->tab == 'execution') js::set('objectID', $bug->execution); if($this->app->tab == 'project') js::set('objectID', $bug->project); ?> From 4268af5d062c9bcdd5fa7226da0554c2f0994732 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 27 Jul 2022 16:22:42 +0800 Subject: [PATCH 2/7] * Fix function name. --- module/kanban/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/kanban/control.php b/module/kanban/control.php index f05f52ccfc..3b4ac85967 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -1512,7 +1512,7 @@ class kanban extends control $this->loadModel($objectType)->delete(constant($table), $objectID); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); - $kanbanID = $regionID ? $this->kanban->getKanbanIDByregion($regionID) : $this->session->execution; + $kanbanID = $regionID ? $this->kanban->getKanbanIDByRegion($regionID) : $this->session->execution; $browseType = $this->config->vision == 'lite' ? 'task' : $this->session->execLaneType; $groupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; $kanbanGroup = $this->kanban->getRDKanban($kanbanID, $browseType, 'id_desc', 0, $groupBy); From 9f3c5e3b30c12faa555acf825fd04cf0a4d93524 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 28 Jul 2022 08:24:34 +0800 Subject: [PATCH 3/7] * Fix bug #25682. --- module/project/css/team.css | 3 +++ module/project/view/team.html.php | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 module/project/css/team.css diff --git a/module/project/css/team.css b/module/project/css/team.css new file mode 100644 index 0000000000..562ac5d95c --- /dev/null +++ b/module/project/css/team.css @@ -0,0 +1,3 @@ +.c-limited {width: 100px;} +[lang^=de] .c-limited {width: 175px !important;} +.c-actions-1 {width: 80px;} diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php index 695bf8ee1c..a128f443b5 100644 --- a/module/project/view/team.html.php +++ b/module/project/view/team.html.php @@ -58,9 +58,9 @@ team->days;?> team->hours;?> team->totalHours;?> - team->limited;?> + team->limited;?> - actions;?> + actions;?> From 0f75b6ef36de5a4c29aa903665be9c908ffa33a5 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 28 Jul 2022 13:03:09 +0800 Subject: [PATCH 4/7] * Fix bug #25808. --- module/release/view/browse.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index f28acb9dfa..c3920a3f16 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -86,9 +86,9 @@ -
show('right', 'pagerjs');?>
+ From 6336149a1e7c63a8d6d1131d55c9dc142ab0a1d9 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 28 Jul 2022 13:33:38 +0800 Subject: [PATCH 5/7] * Fix bug #25766. --- module/design/view/edit.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/design/view/edit.html.php b/module/design/view/edit.html.php index 42d3108719..6ecc46323a 100644 --- a/module/design/view/edit.html.php +++ b/module/design/view/edit.html.php @@ -79,7 +79,7 @@ tasks as $task):?> id?> - createLink('task', 'view', "taskID=$task->id"), $task->name, '_blank');?>; + createLink('task', 'view', "taskID=$task->id"), $task->name, '_blank');?> assignedTo);?> processStatus('task', $task);?> consumed;?> From d515c08c5e62757e1ea8ef5d6dbbeb511f9d7676 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 28 Jul 2022 13:42:31 +0800 Subject: [PATCH 6/7] * Fix bug #25683. --- module/personnel/css/whitelist.css | 3 ++- module/personnel/view/whitelist.html.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/personnel/css/whitelist.css b/module/personnel/css/whitelist.css index 4c4d68cd08..fe83c611e1 100644 --- a/module/personnel/css/whitelist.css +++ b/module/personnel/css/whitelist.css @@ -1,3 +1,4 @@ -.c-dept {overflow:hidden; text-overflow: ellipsis; white-space: nowrap;} +.c-dept, .c-role {overflow:hidden; text-overflow: ellipsis; white-space: nowrap;} .c-phone {width: 120px;} .c-email {width: 200px;} +.c-role {width: 105px;} diff --git a/module/personnel/view/whitelist.html.php b/module/personnel/view/whitelist.html.php index 65ec18427c..1ebc7c4bf9 100644 --- a/module/personnel/view/whitelist.html.php +++ b/module/personnel/view/whitelist.html.php @@ -51,7 +51,7 @@ realname;?> dept);?> - user->roleList, $user->role);?> + user->roleList, $user->role);?> phone;?> qq;?> weixin;?> From dbcb3c9f1b4b72f74a842322882d7c3f97ec19c8 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 28 Jul 2022 13:44:04 +0800 Subject: [PATCH 7/7] * Fix bug #25465. --- module/bug/js/common.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/bug/js/common.js b/module/bug/js/common.js index 2fe4c691ce..3ddab97a57 100644 --- a/module/bug/js/common.js +++ b/module/bug/js/common.js @@ -62,8 +62,8 @@ function loadAllUsers() { isClosedBug = typeof isClosedBug == 'undefined' ? false : isClosedBug; - var params = isClosedBug ? '¶ms=devfirst' : ''; - var link = createLink('bug', 'ajaxLoadAllUsers', 'selectedUser=' + $('#assignedTo').val() + params); + var params = isClosedBug ? '¶ms=devfirst' : ''; + var link = createLink('bug', 'ajaxLoadAllUsers', 'selectedUser=' + $('#assignedTo').val() + params); $.get(link, function(data) { if(data)