From 59aaaa4fc0bde9635b787cba9c20cfdf183c067d Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Wed, 2 Mar 2022 15:02:44 +0800 Subject: [PATCH 01/11] * Fix priv. --- extension/lite/group/ext/lang/resource.php | 139 ++------------------- 1 file changed, 10 insertions(+), 129 deletions(-) diff --git a/extension/lite/group/ext/lang/resource.php b/extension/lite/group/ext/lang/resource.php index 7f11f507f4..8d647c9d9c 100644 --- a/extension/lite/group/ext/lang/resource.php +++ b/extension/lite/group/ext/lang/resource.php @@ -304,6 +304,7 @@ $lang->resource->kanban->close = 'close'; $lang->resource->kanban->delete = 'delete'; $lang->resource->kanban->createRegion = 'createRegion'; $lang->resource->kanban->editRegion = 'editRegion'; +$lang->resource->kanban->performable = 'performable'; $lang->resource->kanban->sortRegion = 'sortRegion'; $lang->resource->kanban->sortGroup = 'sortGroup'; $lang->resource->kanban->deleteRegion = 'deleteRegion'; @@ -330,12 +331,14 @@ $lang->resource->kanban->deleteCard = 'deleteCard'; $lang->resource->kanban->moveCard = 'moveCard'; $lang->resource->kanban->setCardColor = 'setCardColor'; $lang->resource->kanban->laneMove = 'laneMove'; -$lang->resource->kanban->cardsSort = 'cardsSort'; $lang->resource->kanban->viewArchivedColumn = 'viewArchivedColumn'; $lang->resource->kanban->viewArchivedCard = 'viewArchivedCard'; $lang->resource->kanban->restoreCard = 'restoreCard'; $lang->resource->kanban->setLaneHeight = 'setLaneHeight'; +$lang->resource->kanban->setColumnWidth = 'setColumnWidth'; $lang->resource->kanban->batchCreateCard = 'batchCreateCard'; +$lang->resource->kanban->import = 'import'; +$lang->resource->kanban->enableArchived = 'enableArchived'; $lang->kanban->methodOrder[5] = 'space'; $lang->kanban->methodOrder[10] = 'createSpace'; @@ -381,6 +384,10 @@ $lang->kanban->methodorder[200] = 'viewArchivedCard'; $lang->kanban->methodorder[205] = 'archiveColumn'; $lang->kanban->methodorder[210] = 'restoreCard'; $lang->kanban->methodorder[215] = 'setLaneHeight'; +$lang->kanban->methodorder[220] = 'setColumnWidth'; +$lang->kanban->methodOrder[225] = 'batchCreateCard'; +$lang->kanban->methodorder[230] = 'import'; +$lang->kanban->methodorder[235] = 'enableArchived'; /* Execution. */ $lang->resource->execution = new stdclass(); @@ -710,8 +717,8 @@ $lang->resource->user->todo = 'todo'; $lang->resource->user->story = 'story'; $lang->resource->user->task = 'task'; //$lang->resource->user->bug = 'bug'; -$lang->resource->user->testTask = 'testTask'; -$lang->resource->user->testCase = 'testCase'; +//$lang->resource->user->testTask = 'testTask'; +//$lang->resource->user->testCase = 'testCase'; $lang->resource->user->execution = 'execution'; $lang->resource->user->dynamic = 'dynamic'; $lang->resource->user->cropAvatar = 'cropAvatar'; @@ -1115,132 +1122,6 @@ if($config->edition == 'biz' or $config->edition == 'max') $lang->tree->methodOrder[35] = 'editHost'; $lang->host->methodOrder[40] = 'groupMaintenance'; - $lang->resource->ops = new stdclass(); - $lang->resource->ops->index = 'index'; - $lang->resource->ops->setting = 'setting'; - - $lang->ops->methodOrder[5] = 'index'; - $lang->ops->methodOrder[10] = 'setting'; - - $lang->resource->host = new stdclass(); - $lang->resource->host->browse = 'browse'; - $lang->resource->host->create = 'create'; - $lang->resource->host->edit = 'editAction'; - $lang->resource->host->view = 'view'; - $lang->resource->host->delete = 'deleteAction'; - $lang->resource->host->changeStatus = 'changeStatus'; - $lang->resource->host->treemap = 'treemap'; - - $lang->host->methodOrder[5] = 'browse'; - $lang->host->methodOrder[10] = 'create'; - $lang->host->methodOrder[15] = 'edit'; - $lang->host->methodOrder[20] = 'view'; - $lang->host->methodOrder[25] = 'delete'; - $lang->host->methodOrder[30] = 'changeStatus'; - $lang->host->methodOrder[35] = 'treemap'; - - $lang->resource->serverroom = new stdclass(); - $lang->resource->serverroom->browse = 'browse'; - $lang->resource->serverroom->create = 'create'; - $lang->resource->serverroom->edit = 'editAction'; - $lang->resource->serverroom->view = 'view'; - $lang->resource->serverroom->delete = 'delete'; - - $lang->serverroom->methodOrder[5] = 'browse'; - $lang->serverroom->methodOrder[10] = 'create'; - $lang->serverroom->methodOrder[15] = 'edit'; - $lang->serverroom->methodOrder[20] = 'view'; - $lang->serverroom->methodOrder[25] = 'delete'; - - $lang->resource->account = new stdclass(); - $lang->resource->account->browse = 'browse'; - $lang->resource->account->create = 'create'; - $lang->resource->account->edit = 'editAction'; - $lang->resource->account->view = 'view'; - $lang->resource->account->delete = 'deleteAction'; - - $lang->account = new stdclass(); - $lang->account->methodOrder[5] = 'browse'; - $lang->account->methodOrder[10] = 'create'; - $lang->account->methodOrder[15] = 'edit'; - $lang->account->methodOrder[20] = 'view'; - $lang->account->methodOrder[25] = 'delete'; - - $lang->resource->domain = new stdclass(); - $lang->resource->domain->browse = 'browse'; - $lang->resource->domain->create = 'create'; - $lang->resource->domain->edit = 'editAction'; - $lang->resource->domain->view = 'view'; - $lang->resource->domain->delete = 'deleteAction'; - - $lang->domain = new stdclass(); - $lang->domain->methodOrder[5] = 'browse'; - $lang->domain->methodOrder[10] = 'create'; - $lang->domain->methodOrder[15] = 'edit'; - $lang->domain->methodOrder[20] = 'view'; - $lang->domain->methodOrder[25] = 'delete'; - - - $lang->resource->service = new stdclass(); - $lang->resource->service->index = 'index'; - $lang->resource->service->create = 'create'; - $lang->resource->service->edit = 'edit'; - $lang->resource->service->view = 'view'; - $lang->resource->service->delete = 'delete'; - $lang->resource->service->manage = 'manage'; - $lang->resource->service->browse = 'browse'; - - $lang->service->methodOrder[5] = 'index'; - $lang->service->methodOrder[10] = 'create'; - $lang->service->methodOrder[15] = 'edit'; - $lang->service->methodOrder[20] = 'view'; - $lang->service->methodOrder[25] = 'delete'; - $lang->service->methodOrder[30] = 'manage'; - $lang->service->methodOrder[35] = 'browse'; - - $lang->resource->deploy = new stdclass(); - $lang->resource->deploy->browse = 'browse'; - $lang->resource->deploy->create = 'create'; - $lang->resource->deploy->edit = 'editAction'; - $lang->resource->deploy->delete = 'deleteAction'; - $lang->resource->deploy->activate = 'activateAction'; - $lang->resource->deploy->finish = 'finishAction'; - $lang->resource->deploy->scope = 'scope'; - $lang->resource->deploy->manageScope = 'manageScope'; - $lang->resource->deploy->view = 'view'; - $lang->resource->deploy->cases = 'casesAction'; - $lang->resource->deploy->linkCases = 'linkCases'; - $lang->resource->deploy->unlinkCase = 'unlinkCase'; - $lang->resource->deploy->batchUnlinkCases = 'batchUnlinkCases'; - $lang->resource->deploy->steps = 'steps'; - $lang->resource->deploy->manageStep = 'manageStep'; - $lang->resource->deploy->finishStep = 'finishStep'; - $lang->resource->deploy->assignTo = 'assignAction'; - $lang->resource->deploy->viewStep = 'viewStep'; - $lang->resource->deploy->editStep = 'editStep'; - $lang->resource->deploy->deleteStep = 'deleteStep'; - - $lang->service->methodOrder[5] = 'browse'; - $lang->service->methodOrder[10] = 'create'; - $lang->service->methodOrder[15] = 'edit'; - $lang->service->methodOrder[20] = 'delete'; - $lang->service->methodOrder[25] = 'activate'; - $lang->service->methodOrder[30] = 'finish'; - $lang->service->methodOrder[35] = 'scope'; - $lang->service->methodOrder[40] = 'manageScope'; - $lang->service->methodOrder[45] = 'view'; - $lang->service->methodOrder[50] = 'cases'; - $lang->service->methodOrder[55] = 'linkCases'; - $lang->service->methodOrder[60] = 'unlinkCase'; - $lang->service->methodOrder[65] = 'batchUnlinkCases'; - $lang->service->methodOrder[70] = 'steps'; - $lang->service->methodOrder[75] = 'manageStep'; - $lang->service->methodOrder[80] = 'finishStep'; - $lang->service->methodOrder[85] = 'assignTo'; - $lang->service->methodOrder[90] = 'viewStep'; - $lang->service->methodOrder[95] = 'editStep'; - $lang->service->methodOrder[100] = 'deleteStep'; - $lang->resource->doc->diff = 'diffAction'; $lang->resource->doc->catalog = 'catalogAction'; From 5979f3271240cdf7c56d652979ec7965f4388c03 Mon Sep 17 00:00:00 2001 From: Zongjun Lan Date: Wed, 2 Mar 2022 15:04:12 +0800 Subject: [PATCH 02/11] * fix bug 20029 --- extension/lite/product/ext/view/browse.html.php | 4 ++-- extension/lite/tree/ext/control/browse.php | 11 +++++++++++ .../lite/tree/ext/view/browse.lite.html.hook.php | 3 +++ module/product/view/browse.html.php | 2 +- module/tree/view/browse.html.php | 2 +- 5 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 extension/lite/tree/ext/control/browse.php create mode 100644 extension/lite/tree/ext/view/browse.lite.html.hook.php diff --git a/extension/lite/product/ext/view/browse.html.php b/extension/lite/product/ext/view/browse.html.php index 7920a0dc86..ffffa96aca 100644 --- a/extension/lite/product/ext/view/browse.html.php +++ b/extension/lite/product/ext/view/browse.html.php @@ -112,7 +112,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; $tab = $isProjectStory ? 'project' : 'product'; $class = common::hasPriv('story', 'export') ? '' : "class=disabled"; $misc = common::hasPriv('story', 'export') ? "data-toggle='modal' data-type='iframe' class='export' data-app='$tab'" : "class=disabled"; - $link = common::hasPriv('story', 'export') ? $this->createLink('story', 'export', "productID=$productID&orderBy=$orderBy&projectID=0&browseType=$browseType&type=$storyType") : '#'; + $link = common::hasPriv('story', 'export') ? $this->createLink('story', 'export', "productID=$productID&orderBy=$orderBy&executionID=$projectID&browseType=$browseType&type=$storyType") : '#'; echo "
  • " . html::a($link, $lang->story->export, '', $misc) . "
    • "; ?> @@ -191,7 +191,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
    - tree->manageMenu, '', "class='btn btn-info btn-wide'");?> + tree->manageMenu, '', "class='btn btn-info btn-wide'");?>
    diff --git a/extension/lite/tree/ext/control/browse.php b/extension/lite/tree/ext/control/browse.php new file mode 100644 index 0000000000..1ec13144e1 --- /dev/null +++ b/extension/lite/tree/ext/control/browse.php @@ -0,0 +1,11 @@ +view->projectID = $projectID; + $this->view->projectName = $this->dao->findById($projectID)->from(TABLE_PROJECT)->fetch('name'); + return parent::browse($rootID, $view, $currentModuleID, $branch, $from); + } +} diff --git a/extension/lite/tree/ext/view/browse.lite.html.hook.php b/extension/lite/tree/ext/view/browse.lite.html.hook.php new file mode 100644 index 0000000000..2504784584 --- /dev/null +++ b/extension/lite/tree/ext/view/browse.lite.html.hook.php @@ -0,0 +1,3 @@ + diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 6f4793f2fc..bad23ca211 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -138,7 +138,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; $tab = $isProjectStory ? 'project' : 'product'; $class = common::hasPriv('story', 'export') ? '' : "class=disabled"; $misc = common::hasPriv('story', 'export') ? "data-toggle='modal' data-type='iframe' class='export' data-app='$tab'" : "class=disabled"; - $link = common::hasPriv('story', 'export') ? $this->createLink('story', 'export', "productID=$productID&orderBy=$orderBy&projectID=0&browseType=$browseType&type=$storyType") : '#'; + $link = common::hasPriv('story', 'export') ? $this->createLink('story', 'export', "productID=$productID&orderBy=$orderBy&projectID=0&executionID=0&browseType=$browseType&type=$storyType") : '#'; echo "
  • " . html::a($link, $lang->story->export, '', $misc) . "
    • "; ?> diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index 0721db9cd5..9cf64ae901 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -221,7 +221,7 @@ $(function() }, itemCreator: function($li, item) { - var link = (item.id !== undefined && item.type != 'line') ? ('' + item.name + '') : ('' + item.name + ''); + var link = (item.id !== undefined && item.type != 'line') ? ('' + item.name + '') : ('' + item.name + ''); var $toggle = $('' + link + ''); if(item.type === 'bug') $toggle.append('  [B]'); if(item.type === 'case') $toggle.append('  [C]'); From 97a174cefe56ca2f13fa4d1f8c27f8f88b3bf793 Mon Sep 17 00:00:00 2001 From: Zongjun Lan Date: Wed, 2 Mar 2022 15:42:55 +0800 Subject: [PATCH 03/11] * modify tree config --- extension/lite/tree/ext/lang/zh-cn/lite.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/lite/tree/ext/lang/zh-cn/lite.php b/extension/lite/tree/ext/lang/zh-cn/lite.php index e4757d6003..628a9f53db 100644 --- a/extension/lite/tree/ext/lang/zh-cn/lite.php +++ b/extension/lite/tree/ext/lang/zh-cn/lite.php @@ -3,11 +3,11 @@ $lang->tree->all = '所有目录'; $lang->tree->allMenu = $lang->tree->all; $lang->tree->manageMenu = '维护目录'; +$lang->tree->manage = '维护目录'; global $app; if ($app->rawModule == 'tree' and $app->rawMethod == 'browsetask') { - $lang->tree->manage = '维护目录'; $lang->tree->common = '目录维护'; $lang->tree->manageExecution = "维护{$lang->executionCommon}视图目录"; $lang->tree->manageTaskChild = "维护{$lang->executionCommon}子目录"; From cdf4b29e2946e3ab5bc3778409d635cfd2a8fec8 Mon Sep 17 00:00:00 2001 From: Zongjun Lan Date: Wed, 2 Mar 2022 18:43:41 +0800 Subject: [PATCH 04/11] * fix bug 20030 --- 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 3a077b1610..9fd29f8c99 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -506,7 +506,7 @@ class task extends control $this->view->position[] = $this->lang->task->edit; $this->view->stories = $this->story->getExecutionStoryPairs($this->view->execution->id); $this->view->tasks = $tasks; - $this->view->users = $this->loadModel('user')->getPairs('nodeleted', "{$this->view->task->openedBy},{$this->view->task->canceledBy},{$this->view->task->closedBy}"); + $this->view->users = $this->loadModel('user')->getPairs('nodeleted|noclosed', "{$this->view->task->openedBy},{$this->view->task->canceledBy},{$this->view->task->closedBy}"); $this->view->showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : ''; $this->view->modules = $this->tree->getTaskOptionMenu($this->view->task->execution, 0, 0, $this->view->showAllModule ? 'allModule' : ''); $this->view->executions = $executionsPair; From 0512526c2391c685bf3e5157d9939215f4528c23 Mon Sep 17 00:00:00 2001 From: Zongjun Lan Date: Thu, 3 Mar 2022 10:07:55 +0800 Subject: [PATCH 05/11] * fix bug 19713 --- extension/lite/tree/ext/control/browse.php | 12 ++++++++++++ module/execution/js/kanban.js | 1 + 2 files changed, 13 insertions(+) diff --git a/extension/lite/tree/ext/control/browse.php b/extension/lite/tree/ext/control/browse.php index 1ec13144e1..b8513cc31d 100644 --- a/extension/lite/tree/ext/control/browse.php +++ b/extension/lite/tree/ext/control/browse.php @@ -2,6 +2,18 @@ helper::importControl('tree'); class myTree extends tree { + /** + * Module browse. + * + * @param int $rootID + * @param string $view story|bug|case|doc + * @param int $currentModuleID + * @param int $branch + * @param string $from + * @param int $projectID + * @access public + * @return void + */ public function browse($rootID, $view, $currentModuleID = 0, $branch = 0, $from = '', $projectID = 0) { $this->view->projectID = $projectID; diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index 629c975563..151ee611b4 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -1072,6 +1072,7 @@ function createTaskMenu(options) if(priv.canRestartTask && task.$col.type == 'pause') items.push({label: taskLang.restart, icon: 'play', url: createLink('task', 'restart', 'taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); if(priv.canPauseTask && task.$col.type == 'developing') items.push({label: taskLang.pause, icon: 'pause', url: createLink('task', 'pause', 'taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); if(priv.canRecordEstimateTask) items.push({label: executionLang.effort, icon: 'time', url: createLink('task', 'recordEstimate', 'taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); + if(priv.canBatchCreateTask && vision == 'lite') items.push({label: taskLang.children, icon:'split', url: $.createLink('task', 'batchcreate', 'executionID=' + executionID + '&storyID=0&moduleID=0&taskID=' + task.id, '', true), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); if(priv.canActivateTask && (task.$col.type == 'developed' || task.$col.type == 'canceled' || task.$col.type == 'closed')) items.push({label: executionLang.activate, icon: 'magic', url: createLink('task', 'activate', 'taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); if(priv.canCreateTask) items.push({label: taskLang.copy, icon: 'copy', url: createLink('task', 'create', 'executionID=' + executionID + '&storyID=' + '0' + '&moduleID=' + '0' + '&taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); if(priv.canCancelTask && (task.$col.type == 'wait' || task.$col.type == 'developing' || task.$col.type == 'pause')) items.push({label: taskLang.cancel, icon: 'cancel', url: createLink('task', 'cancel', 'taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); From c1f97b8d1af063fd85ef8180b1bec0b75e58b865 Mon Sep 17 00:00:00 2001 From: Zongjun Lan Date: Thu, 3 Mar 2022 10:18:12 +0800 Subject: [PATCH 06/11] * format code --- extension/lite/tree/ext/control/browse.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/lite/tree/ext/control/browse.php b/extension/lite/tree/ext/control/browse.php index b8513cc31d..656807981f 100644 --- a/extension/lite/tree/ext/control/browse.php +++ b/extension/lite/tree/ext/control/browse.php @@ -10,7 +10,7 @@ class myTree extends tree * @param int $currentModuleID * @param int $branch * @param string $from - * @param int $projectID + * @param int $projectID * @access public * @return void */ From 7312bfe658f72e28834b4d741d6561c49f71aa04 Mon Sep 17 00:00:00 2001 From: Zongjun Lan Date: Thu, 3 Mar 2022 14:21:44 +0800 Subject: [PATCH 07/11] * rollback code --- 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 9fd29f8c99..3a077b1610 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -506,7 +506,7 @@ class task extends control $this->view->position[] = $this->lang->task->edit; $this->view->stories = $this->story->getExecutionStoryPairs($this->view->execution->id); $this->view->tasks = $tasks; - $this->view->users = $this->loadModel('user')->getPairs('nodeleted|noclosed', "{$this->view->task->openedBy},{$this->view->task->canceledBy},{$this->view->task->closedBy}"); + $this->view->users = $this->loadModel('user')->getPairs('nodeleted', "{$this->view->task->openedBy},{$this->view->task->canceledBy},{$this->view->task->closedBy}"); $this->view->showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : ''; $this->view->modules = $this->tree->getTaskOptionMenu($this->view->task->execution, 0, 0, $this->view->showAllModule ? 'allModule' : ''); $this->view->executions = $executionsPair; From 794c22298fc05c47976a27fd2814b15f847ccad0 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 3 Mar 2022 14:22:42 +0800 Subject: [PATCH 08/11] * Fix bug #20270. --- module/bug/js/common.js | 2 +- module/build/control.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/bug/js/common.js b/module/bug/js/common.js index 0be2c315f1..a7d2c64f66 100644 --- a/module/bug/js/common.js +++ b/module/bug/js/common.js @@ -619,7 +619,7 @@ function notice() if($('#openedBuild').find('option').length <= 1) { var html = ''; - if(($('#execution').length == 0 || $('#execution').val() == 0) && ($('#project').length == 0 || $('#project').val() == 0)) + if($('#execution').length == 0 || $('#execution').val() == 0) { var branch = $('#branch').val(); if(typeof(branch) == 'undefined') branch = 0; diff --git a/module/build/control.php b/module/build/control.php index b4ec04530f..230a033659 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -392,7 +392,7 @@ class build extends control $isJsonView = $this->app->getViewType() == 'json'; if($varName == 'openedBuild') { - if(empty($projectID)) $this->ajaxGetProductBuilds($productID, $varName, $build, $branch, $index, $type); + if(empty($projectID)) return $this->ajaxGetProductBuilds($productID, $varName, $build, $branch, $index, $type); $params = ($type == 'all') ? 'noempty, withbranch' : 'noempty, noterminate, nodone, withbranch'; $builds = $this->build->getBuildPairs($productID, $branch, $params, $projectID, 'project', $build); @@ -401,7 +401,7 @@ class build extends control } if($varName == 'resolvedBuild') { - if(empty($projectID)) $this->ajaxGetProductBuilds($productID, $varName, $build, $branch, $index, $type); + if(empty($projectID)) return $this->ajaxGetProductBuilds($productID, $varName, $build, $branch, $index, $type); $params = ($type == 'all') ? 'withbranch' : 'noterminate, nodone, withbranch'; $builds = $this->build->getBuildPairs($productID, $branch, $params, $projectID, 'project', $build); From 86d19f82f70011292b79fa83e59e9b458faae37b Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 3 Mar 2022 14:53:58 +0800 Subject: [PATCH 09/11] * Fix bug #20290. --- module/execution/view/view.html.php | 8 ++++---- module/project/view/view.html.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php index ce6b3cf02b..cfda5512d6 100644 --- a/module/execution/view/view.html.php +++ b/module/execution/view/view.html.php @@ -178,7 +178,7 @@

    id;?> code;?> name;?>

    -

    desc;?>

    +
    desc;?>

    deleted):?> execution->deleted;?> @@ -253,7 +253,7 @@ execution->totalEstimate;?> - totalEstimate . $lang->execution->workHour;?> + totalEstimate . $lang->execution->workHour;?> execution->totalDays;?> days;?> @@ -261,11 +261,11 @@ execution->totalConsumed;?> totalConsumed . $lang->execution->workHour;?> execution->totalHours;?> - totalHours . $lang->execution->workHour;?> + totalHours . $lang->execution->workHour;?> execution->totalLeft;?> - totalLeft . $lang->execution->workHour;?> + totalLeft . $lang->execution->workHour;?> diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index 0285d8c651..7f6c7a7051 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -118,7 +118,7 @@

    id;?> code;?> name;?>

    -

    desc;?>

    +
    desc;?>

    deleted):?> project->deleted;?> From fed5f3cb4e136d86a804aefdc8cc44d0514329be Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 3 Mar 2022 15:46:05 +0800 Subject: [PATCH 10/11] * Fix bug #20302. --- module/my/control.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/my/control.php b/module/my/control.php index 9aa6c6a79e..5937f71649 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -1014,14 +1014,14 @@ EOF; } $listID = $this->user->createContactList($data->newList, $data->users); $this->user->setGlobalContacts($listID, isset($data->share)); - if(isonlybody()) return print(js::closeModal('parent.parent', '', ' function(){parent.parent.ajaxGetContacts(\'#mailto\')}')); + if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.parent.ajaxGetContacts('#mailto')")); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('manageContacts', "listID=$listID"))); } elseif($data->mode == 'edit') { $this->user->updateContactList($data->listID, $data->listName, $data->users); $this->user->setGlobalContacts($data->listID, isset($data->share)); - return print(js::locate(inlink('manageContacts', "listID={$data->listID}"), 'parent')); + return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('manageContacts', "listID=$listID"))); } } From e9b4765a493d81bff56dd66656cd3c03b0af490e Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Thu, 3 Mar 2022 15:48:36 +0800 Subject: [PATCH 11/11] * Determines whether to process indexes when upgrading. --- module/upgrade/model.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 1d3f909710..3899aec5fd 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -3023,13 +3023,13 @@ class upgradeModel extends model if(strpos($fromVersion, 'max') === false and strpos($fromVersion, 'biz') === false and (strpos($fromVersion, 'pro') === false ? version_compare($fromVersion, '8.3', '<') : version_compare($fromVersion, 'pro5.4', '<'))) $needProcess['updateFile'] = true; if(strpos($fromVersion, 'max') === false and $this->config->systemMode == 'new') { - if(strpos($fromVersion, 'pro') !== false and version_compare($fromVersion, 'pro10.0', '<')) + if(strpos($fromVersion, 'pro') !== false) { - $needProcess['search'] = true; + if(version_compare($fromVersion, 'pro10.0', '<')) $needProcess['search'] = true; } - elseif(strpos($fromVersion, 'biz') !== false and version_compare($fromVersion, 'biz5.0', '<')) + elseif(strpos($fromVersion, 'biz') !== false) { - $needProcess['search'] = true; + if(version_compare($fromVersion, 'biz5.0', '<')) $needProcess['search'] = true; } elseif(version_compare($fromVersion, '15.0.rc1', '<')) {