From f8cd6fe1cbee1666db8c565c4c3146af16b64d66 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Mon, 25 Jul 2022 09:43:53 +0800 Subject: [PATCH 01/17] * Finish task #61811,61812. --- module/mr/control.php | 2 ++ module/mr/css/create.css | 1 + module/mr/lang/de.php | 1 + module/mr/lang/en.php | 1 + module/mr/lang/fr.php | 1 + module/mr/lang/vi.php | 1 + module/mr/lang/zh-cn.php | 1 + module/mr/view/browse.html.php | 8 +++++--- module/mr/view/create.html.php | 4 ++-- module/mr/view/view.html.php | 4 ++++ 10 files changed, 19 insertions(+), 5 deletions(-) diff --git a/module/mr/control.php b/module/mr/control.php index 0b0bc2ef60..7fe28b3372 100644 --- a/module/mr/control.php +++ b/module/mr/control.php @@ -303,6 +303,8 @@ class mr extends control $this->view->stories = $this->mr->getLinkList($MR->id, $product->id, 'story'); $this->view->bugs = $this->mr->getLinkList($MR->id, $product->id, 'bug'); $this->view->tasks = $this->mr->getLinkList($MR->id, $product->id, 'task'); + $this->view->actions = $this->loadModel('action')->getList('mr', $MRID); + $this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed'); $this->display(); } diff --git a/module/mr/css/create.css b/module/mr/css/create.css index 7176c78083..d5bc7e6536 100644 --- a/module/mr/css/create.css +++ b/module/mr/css/create.css @@ -1 +1,2 @@ #mrForm table tbody th {width: 145px;} +.branch-btn {width: 110px; height: 32px; line-height: 22px; float: right;} diff --git a/module/mr/lang/de.php b/module/mr/lang/de.php index 75fd977b34..c24db27c9a 100644 --- a/module/mr/lang/de.php +++ b/module/mr/lang/de.php @@ -30,6 +30,7 @@ $lang->mr->mriid = "raw MR ID"; $lang->mr->title = 'Name'; $lang->mr->status = 'Status'; $lang->mr->author = 'Author'; +$lang->mr->createdDate = 'Created date'; $lang->mr->assignee = 'Assignee'; $lang->mr->reviewer = 'Reviewer'; $lang->mr->mergeStatus = 'Merge status'; diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php index 75fd977b34..c24db27c9a 100644 --- a/module/mr/lang/en.php +++ b/module/mr/lang/en.php @@ -30,6 +30,7 @@ $lang->mr->mriid = "raw MR ID"; $lang->mr->title = 'Name'; $lang->mr->status = 'Status'; $lang->mr->author = 'Author'; +$lang->mr->createdDate = 'Created date'; $lang->mr->assignee = 'Assignee'; $lang->mr->reviewer = 'Reviewer'; $lang->mr->mergeStatus = 'Merge status'; diff --git a/module/mr/lang/fr.php b/module/mr/lang/fr.php index 75fd977b34..c24db27c9a 100644 --- a/module/mr/lang/fr.php +++ b/module/mr/lang/fr.php @@ -30,6 +30,7 @@ $lang->mr->mriid = "raw MR ID"; $lang->mr->title = 'Name'; $lang->mr->status = 'Status'; $lang->mr->author = 'Author'; +$lang->mr->createdDate = 'Created date'; $lang->mr->assignee = 'Assignee'; $lang->mr->reviewer = 'Reviewer'; $lang->mr->mergeStatus = 'Merge status'; diff --git a/module/mr/lang/vi.php b/module/mr/lang/vi.php index 75fd977b34..c24db27c9a 100644 --- a/module/mr/lang/vi.php +++ b/module/mr/lang/vi.php @@ -30,6 +30,7 @@ $lang->mr->mriid = "raw MR ID"; $lang->mr->title = 'Name'; $lang->mr->status = 'Status'; $lang->mr->author = 'Author'; +$lang->mr->createdDate = 'Created date'; $lang->mr->assignee = 'Assignee'; $lang->mr->reviewer = 'Reviewer'; $lang->mr->mergeStatus = 'Merge status'; diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php index 4e4ed474e4..ecefd0fda4 100644 --- a/module/mr/lang/zh-cn.php +++ b/module/mr/lang/zh-cn.php @@ -30,6 +30,7 @@ $lang->mr->mriid = "MR原始ID"; $lang->mr->title = '名称'; $lang->mr->status = '状态'; $lang->mr->author = '创建人'; +$lang->mr->createdDate = '创建时间'; $lang->mr->assignee = '指派给'; $lang->mr->reviewer = '评审人'; $lang->mr->mergeStatus = '是否可合并'; diff --git a/module/mr/view/browse.html.php b/module/mr/view/browse.html.php index 20d3ed910a..025b919da4 100644 --- a/module/mr/view/browse.html.php +++ b/module/mr/view/browse.html.php @@ -50,9 +50,10 @@ mr->title);?> mr->sourceBranch);?> mr->targetBranch);?> - mr->mergeStatus);?> - mr->approvalStatus);?> - mr->author);?> + mr->mergeStatus);?> + mr->approvalStatus);?> + mr->author);?> + mr->createdDate);?> actions;?> @@ -87,6 +88,7 @@ approvalStatus) ? $lang->mr->approvalStatusList['notReviewed'] : $lang->mr->approvalStatusList[$MR->approvalStatus];?> createdBy);?> + createdDate);?> user->admin or (isset($projects[$MR->hostID][$MR->sourceProject]->owner->id) and $projects[$MR->hostID][$MR->sourceProject]->owner->id == $openIDList[$MR->hostID])) ? '' : 'disabled'; diff --git a/module/mr/view/create.html.php b/module/mr/view/create.html.php index 95d794eafb..cfe89386a6 100644 --- a/module/mr/view/create.html.php +++ b/module/mr/view/create.html.php @@ -32,7 +32,7 @@
- mr->sourceBranch ?> + mr->sourceBranch ?>
@@ -42,7 +42,7 @@
- mr->targetBranch ?> + mr->targetBranch ?>
diff --git a/module/mr/view/view.html.php b/module/mr/view/view.html.php index 190a484577..83323b76c2 100644 --- a/module/mr/view/view.html.php +++ b/module/mr/view/view.html.php @@ -105,6 +105,10 @@
mr->commandDocument, $httpRepoURL, $MR->sourceBranch, $branchPath, $MR->targetBranch, $branchPath, $MR->targetBranch); ?>
+ app->getViewType() != 'xhtml'):?> +
+ +
From 78e6133a0ff76bc9d4d68e579cd3495e6db4824a Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Mon, 25 Jul 2022 10:37:59 +0800 Subject: [PATCH 02/17] * Adjust codes. --- module/mr/js/view.js | 14 +++++++------- module/mr/view/view.html.php | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/module/mr/js/view.js b/module/mr/js/view.js index a6433ab5d2..dcfdf941ef 100644 --- a/module/mr/js/view.js +++ b/module/mr/js/view.js @@ -1,17 +1,17 @@ $(document).ready(function() { $('#mergeButton,.mergeButton').click(function() - { + { link = $(this).attr('href'); $.getJSON(link, function(response) - { + { if(response.result == 'success') { - $.zui.messager.success(response.message); - setTimeout(function(){ location.href=response.locate }, 2500); + $.zui.messager.success(response.message); + setTimeout(function(){ location.href=response.locate }, 2500); } if(response.result == 'fail') $.zui.messager.danger(response.message); - }); + }); return false; - }); - }); + }); +}); diff --git a/module/mr/view/view.html.php b/module/mr/view/view.html.php index 83323b76c2..b22dd9df96 100644 --- a/module/mr/view/view.html.php +++ b/module/mr/view/view.html.php @@ -37,7 +37,7 @@
-
+
  • mr->view);?>
    • @@ -46,7 +46,7 @@
  • id}&type=bug"), html::icon($lang->icons['bug'], 'text-red') . ' ' . $lang->productplan->linkedBugs);?>
  • id}&type=task"), html::icon('todo', 'text-info') . ' ' . $lang->mr->linkedTasks);?>
-
+
From 0c9f532ee0cb939d9c72e41cd4253741e620009f Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 25 Jul 2022 10:40:09 +0800 Subject: [PATCH 03/17] * Finish task #61970,61969,61968,61966. --- module/common/lang/menu.php | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index fc95005d2e..32438dc257 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -291,16 +291,27 @@ $lang->waterfall->menu->design['subMenu']->ads = array('link' => "{$lang->d $lang->waterfall->menu->design['subMenu']->bysearch = array('link' => ' ' . $lang->searchAB . ''); /* Kanban project menu. */ -$lang->kanbanProject = new stdclass(); -$lang->kanbanProject->menu = new stdclass(); -$lang->kanbanProject->menu->index = array('link' => "{$lang->kanban->common}|project|index|project=%s"); -$lang->kanbanProject->menu->build = array('link' => "{$lang->build->common}|project|build|project=%s"); +$lang->kanbanProject = new stdclass(); +$lang->kanbanProject->menu = new stdclass(); +$lang->kanbanProject->menu->index = array('link' => "{$lang->kanban->common}|project|index|project=%s"); +$lang->kanbanProject->menu->build = array('link' => "{$lang->build->common}|project|build|project=%s"); +$lang->kanbanProject->menu->settings = array('link' => "$lang->settings|project|view|project=%s", 'subModule' => 'stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist,team'); -$lang->kanbanProject->menuOrder = array(); -$lang->kanbanProject->menuOrder[5] = 'index'; -$lang->kanbanProject->menuOrder[10] = 'build'; $lang->kanbanProject->dividerMenu = ''; +$lang->kanbanProject->menuOrder = array(); +$lang->kanbanProject->menuOrder[5] = 'index'; +$lang->kanbanProject->menuOrder[10] = 'build'; +$lang->kanbanProject->menuOrder[15] = 'settings'; + +$lang->kanbanProject->menu->settings['subMenu'] = new stdclass(); +$lang->kanbanProject->menu->settings['subMenu']->view = array('link' => "$lang->overview|project|view|project=%s", 'alias' => 'edit'); +$lang->kanbanProject->menu->settings['subMenu']->products = array('link' => "{$lang->product->common}|project|manageProducts|project=%s", 'alias' => 'manageproducts'); +$lang->kanbanProject->menu->settings['subMenu']->members = array('link' => "{$lang->team->common}|project|team|project=%s", 'alias' => 'managemembers,team'); +$lang->kanbanProject->menu->settings['subMenu']->whitelist = array('link' => "{$lang->whitelist}|project|whitelist|project=%s", 'subModule' => 'personnel'); +$lang->kanbanProject->menu->settings['subMenu']->stakeholder = array('link' => "{$lang->stakeholder->common}|stakeholder|browse|project=%s", 'subModule' => 'stakeholder'); +$lang->kanbanProject->menu->settings['subMenu']->group = array('link' => "{$lang->priv}|project|group|project=%s", 'alias' => 'group,manageview,managepriv'); + /* Execution menu. */ $lang->execution->homeMenu = new stdclass(); $lang->execution->homeMenu->all = array('link' => "{$lang->execution->all}|execution|all|", 'alias' => 'create,batchedit'); From 272aaed0a9816954cfad8e6dc0d77ba9818a884f Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Mon, 25 Jul 2022 03:17:42 +0000 Subject: [PATCH 04/17] * Finish task #61909. --- module/search/view/buildform.html.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index a7124727bb..e92fd7f98d 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -322,15 +322,25 @@ $(function() $('#toggle-queries .icon').removeClass('icon-angle-left'); $('#toggle-queries .icon').addClass('icon-angle-right'); $('#toggle-queries').css('right', $('#userQueries').outerWidth()); + $('#save-query').css('right', $('#userQueries').outerWidth() + 50); } else { $('#toggle-queries .icon').removeClass('icon-angle-right'); $('#toggle-queries .icon').addClass('icon-angle-left'); $('#toggle-queries').css('right', '0px'); + $('#save-query').css('right', 50); } }); + $('.sidebar-toggle').click(function() + { + if(!$('#userQueries').hasClass('hidden')) + { + $('#toggle-queries').click(); + } + }) + $(window).resize(function() { if(!$('#userQueries').hasClass('hidden')) $('#toggle-queries').css('right', $('#userQueries').outerWidth()); From 9dd747147f03cdb792a9d96e3112b177fd5d96a5 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Mon, 25 Jul 2022 05:10:38 +0000 Subject: [PATCH 05/17] * Finish task #61909. --- module/search/view/buildform.html.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index e92fd7f98d..80b3e5304a 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -343,7 +343,11 @@ $(function() $(window).resize(function() { - if(!$('#userQueries').hasClass('hidden')) $('#toggle-queries').css('right', $('#userQueries').outerWidth()); + if(!$('#userQueries').hasClass('hidden')) + { + $('#toggle-queries').css('right', $('#userQueries').outerWidth()); + $('#save-query').css('right', $('#userQueries').outerWidth() + 50); + } }) /* From 96c71eb326336f2a2e76b5b7f93a56fcf0d9fd09 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 25 Jul 2022 13:36:14 +0800 Subject: [PATCH 06/17] * Finish task #61967. --- module/personnel/control.php | 9 +------- module/program/model.php | 10 ++++----- module/project/config.php | 6 +++++ module/project/control.php | 12 +++++----- module/project/model.php | 23 ++++++++++++-------- module/project/view/ajaxgetdropmenu.html.php | 2 +- module/project/view/view.html.php | 2 ++ 7 files changed, 36 insertions(+), 28 deletions(-) diff --git a/module/personnel/control.php b/module/personnel/control.php index 2fb6a96424..ef01c4cac7 100644 --- a/module/personnel/control.php +++ b/module/personnel/control.php @@ -103,14 +103,7 @@ class personnel extends control */ public function whitelist($objectID = 0, $module = 'personnel', $objectType = 'program', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1, $programID = 0, $from = '') { - if($this->app->tab == 'program') - { - $this->loadModel('program')->setMenu($objectID); - } - else if($this->app->tab == 'project') - { - $this->loadModel('project')->setMenu($objectID); - } + if($this->app->tab == 'program') $this->loadModel('program')->setMenu($objectID); /* Load lang and set session. */ $this->app->loadLang('user'); diff --git a/module/program/model.php b/module/program/model.php index 0f66c08f7e..9b263d8045 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -1605,17 +1605,17 @@ class programModel extends model $menu .= ""; $menu .= "
"; } - $attr = $program->model == 'kanban' ? " disabled='disabled' style='pointer-events: none;'" : ''; + $menu .= $this->buildMenu('project', 'edit', $params, $program, $type, 'edit', '', 'iframe', true); - $menu .= $this->buildMenu('project', 'team', $params, $program, $type, 'group', '', '', '', 'data-app="project"' . $attr); - $menu .= $this->buildMenu('project', 'group', $params, $program, $type, 'lock', '', '', '', 'data-app="project"' . $attr); + $menu .= $this->buildMenu('project', 'team', $params, $program, $type, 'group', '', '', '', 'data-app="project"'); + $menu .= $this->buildMenu('project', 'group', $params, $program, $type, 'lock', '', '', '', 'data-app="project"'); if(common::hasPriv('project', 'manageProducts') || common::hasPriv('project', 'whitelist') || common::hasPriv('project', 'delete')) { $menu .= "
"; $menu .= ""; $menu .= "