From c4117611423e9149d5a56d05116c65bb874b512a Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Fri, 7 Aug 2020 16:59:44 +0800 Subject: [PATCH 1/8] * Finish task #7617,7615. --- module/task/control.php | 12 ++++++------ module/task/view/create.html.php | 6 +++++- module/task/view/edit.html.php | 3 ++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/module/task/control.php b/module/task/control.php index d76f89ebac..c10819bf31 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -43,7 +43,7 @@ class task extends control * @access public * @return void */ - public function create($projectID = 0, $storyID = '', $moduleID = 0, $taskID = 0, $todoID = 0) + public function create($projectID = 0, $storyID = 0, $moduleID = 0, $taskID = 0, $todoID = 0) { $this->project->getLimitedProject(); $limitedProjects = !empty($_SESSION['limitedProjects']) ? $_SESSION['limitedProjects'] : ''; @@ -460,7 +460,7 @@ class task extends control /* Get edited tasks. */ $tasks = $this->dao->select('*')->from(TABLE_TASK)->where('id')->in($taskIDList)->fetchAll('id'); - $teams = $this->dao->select('*')->from(TABLE_TEAM)->where('root')->in($taskIDList)->andWhere('type')->eq('task')->fetchAll('root'); + $teams = $this->dao->select('*')->from(TABLE_TEAM)->where('root')->in($taskIDList)->andWhere('type')->eq('task')->fetchGroup('root', 'account'); /* Judge whether the editedTasks is too large and set session. */ $countInputVars = count($tasks) * (count(explode(',', $this->config->task->custom->batchEditFields)) + 3); @@ -572,19 +572,19 @@ class task extends control { if(!empty($_POST)) { + $this->loadModel('action'); $taskIDList = $this->post->taskIDList; $taskIDList = array_unique($taskIDList); unset($_POST['taskIDList']); if(!is_array($taskIDList)) die(js::locate($this->createLink('project', 'task', "projectID=$project"), 'parent')); $taskIDList = array_unique($taskIDList); - $muletipleTasks = $this->dao->select('root')->from(TABLE_TEAM)->where('type')->eq('task')->andWhere('root')->in($taskIDList)->fetchPairs(); + $muletipleTasks = $this->dao->select('root , account')->from(TABLE_TEAM)->where('type')->eq('task')->andWhere('root')->in($taskIDList)->fetchGroup('root', 'account'); $tasks = $this->task->getByList($taskIDList); foreach($tasks as $taskID => $task) { - $this->loadModel('action'); - if(in_array($taskID, $muletipleTasks) and $task->assignedTo != $this->app->user->account) continue; - + if(isset($muletipleTasks[$taskID]) and $task->assignedTo != $this->app->user->account) continue; + if(isset($muletipleTasks[$taskID]) and !isset($muletipleTasks[$taskID][$this->post->assignedTo])) continue; $changes = $this->task->assign($taskID); if(dao::isError()) die(js::error(dao::getError())); $actionID = $this->action->create('task', $taskID, 'Assigned', $this->post->comment, $this->post->assignedTo); diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index fede9e1420..c9665e8bb3 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -163,7 +163,11 @@ } $priList = $lang->task->priList; if(end($priList)) unset($priList[0]); - if(!isset($priList[$task->pri])) $task->pri = reset($priList); + if(!isset($priList[$task->pri])) + { + reset($priList); + $task->pri = key($priList); + } ?> pri, "class='form-control'");?> diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index b01134b9fc..bd1c2240b4 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -122,7 +122,8 @@ task->assignedTo;?> team) and $task->assignedTo != $this->app->user->account) ? "disabled='disabled'" :'';?> - assignedTo, "class='form-control chosen' {$disableAssignedTo}");?> + team) ? array_intersect_key($members, $task->team) : $members;?> + assignedTo, "class='form-control chosen' {$disableAssignedTo}");?> ' id='teamTr'> task->team;?> From 7de5503bbea0431a46a6c309f1f02990d7eb76a7 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Fri, 7 Aug 2020 17:25:54 +0800 Subject: [PATCH 2/8] * add new version and upgrade. --- db/update12.4.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 db/update12.4.sql diff --git a/db/update12.4.sql b/db/update12.4.sql new file mode 100644 index 0000000000..86a1e93519 --- /dev/null +++ b/db/update12.4.sql @@ -0,0 +1 @@ +update zt_action set `project` = `extra` where action = 'unlinkedfromproject' and `project` = 0; From 99e92ac05fd6b85d4b2211331a77d50090c2a6bd Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Fri, 7 Aug 2020 17:27:54 +0800 Subject: [PATCH 3/8] * Finish task #7611. --- module/repo/control.php | 2 +- module/repo/view/ajaxsidecommits.html.php | 1 - module/repo/view/log.html.php | 5 +---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/module/repo/control.php b/module/repo/control.php index 16bc29735d..3fadef9f41 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -548,7 +548,7 @@ class repo extends control if(isset($pathInfo["extension"])) $suffix = strtolower($pathInfo["extension"]); $arrange = $this->cookie->arrange ? $this->cookie->arrange : 'inline'; - if(!empty($_POST)) + if($this->server->request_method) { $oldRevision = isset($this->post->revision[1]) ?$this->post->revision[1] : ''; $newRevision = isset($this->post->revision[0]) ?$this->post->revision[0] : ''; diff --git a/module/repo/view/ajaxsidecommits.html.php b/module/repo/view/ajaxsidecommits.html.php index 1f8e9453dc..5157efda55 100644 --- a/module/repo/view/ajaxsidecommits.html.php +++ b/module/repo/view/ajaxsidecommits.html.php @@ -50,7 +50,6 @@ if(isset($entry)) $pathInfo .= '&type=file';
- repo->diff, '', count($revisions) < 2 ? 'disabled btn btn-primary' : 'btn btn-primary')?> repo->createLink('log', "repoID=$repoID&entry=&revision=HEAD&type=$logType", "entry=" . $this->repo->encodePath($path)), $lang->repo->allLog, '', "class='allLogs'");?>
diff --git a/module/repo/view/log.html.php b/module/repo/view/log.html.php index 50f9374d01..ff75246c2b 100644 --- a/module/repo/view/log.html.php +++ b/module/repo/view/log.html.php @@ -82,10 +82,7 @@
- repo->diff, '', 'btn btn-primary'); - ?> + repo->diff, '', 'btn btn-primary')?> show('right', 'pagerjs');?>
From 5755239f21d11430a93886e127276ae8676c9fa1 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Fri, 7 Aug 2020 17:28:45 +0800 Subject: [PATCH 4/8] * Finish task #7612. --- module/story/model.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/module/story/model.php b/module/story/model.php index fd14286e6d..1942bffc2a 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -1306,7 +1306,7 @@ class storyModel extends model foreach($storyIdList as $storyID) { $oldStory = $oldStories[$storyID]; - if($oldStory->status == 'draft') + if($oldStory->status == 'draft' or $oldStory->status == 'closed') { $ignoreStories .= "#{$storyID} "; continue; @@ -1320,7 +1320,6 @@ class storyModel extends model $this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq((int)$storyID)->exec(); $this->dao->update(TABLE_STORYSTAGE)->set('stage')->eq($stage)->set('stagedBy')->eq($account)->where('story')->eq((int)$storyID)->exec(); - $this->setStage($storyID); if(!dao::isError()) $allChanges[$storyID] = common::createChanges($oldStory, $story); } if($ignoreStories) echo js::alert(sprintf($this->lang->story->ignoreChangeStage, $ignoreStories)); From 28af4d63da93791c6181213f22cb26f1c70ce7da Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Fri, 7 Aug 2020 17:29:16 +0800 Subject: [PATCH 5/8] * Finish task #7613. --- module/task/model.php | 1 + module/task/view/batchedit.html.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/module/task/model.php b/module/task/model.php index da8538011e..717fbfcf1e 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1075,6 +1075,7 @@ class taskModel extends model foreach($tasks as $taskID => $task) { + if($task->status == 'done' and $task->consumed == false) die(js::error('task#' . $taskID . sprintf($this->lang->error->notempty, $this->lang->task->consumedThisTime))); $oldTask = $oldTasks[$taskID]; $this->dao->update(TABLE_TASK)->data($task) ->autoCheck() diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index a905387ae7..6cd57031aa 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -58,7 +58,7 @@ '>task->status;?> '>task->pri;?> '>task->estimateAB;?> - '>task->consumed;?> + '>task->consumedThisTime;?> '>task->leftAB?> '>task->estStarted?> '>task->deadline?> From 0bfb09736e5272ca3fe0417417c37386e77ee5bb Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Fri, 7 Aug 2020 17:31:04 +0800 Subject: [PATCH 6/8] * Change back to the previous version. --- module/testtask/config.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/testtask/config.php b/module/testtask/config.php index 5f6b6ccee6..66c12c437d 100644 --- a/module/testtask/config.php +++ b/module/testtask/config.php @@ -5,8 +5,8 @@ $config->testtask->edit = new stdclass(); $config->testtask->create->requiredFields = 'project,build,begin,end,name'; $config->testtask->edit->requiredFields = 'project,build,begin,end,name'; -$config->testtask->importUnitResult = new stdclass(); -$config->testtask->importUnitResult->requiredFields = 'project,build,begin,end,name,resultFile'; +$config->testtask->importunitresult = new stdclass(); +$config->testtask->importunitresult->requiredFields = 'project,build,begin,end,name,resultFile'; $config->testtask->editor = new stdclass(); $config->testtask->editor->create = array('id' => 'desc', 'tools' => 'simpleTools'); @@ -16,7 +16,7 @@ $config->testtask->editor->start = array('id' => 'comment', 'tools' = $config->testtask->editor->close = array('id' => 'report,comment', 'tools' => 'simpleTools'); $config->testtask->editor->block = array('id' => 'comment', 'tools' => 'simpleTools'); $config->testtask->editor->activate = array('id' => 'comment', 'tools' => 'simpleTools'); -$config->testtask->editor->importUnitResult = array('id' => 'desc', 'tools' => 'simpleTools'); +$config->testtask->editor->importunitresult = array('id' => 'desc', 'tools' => 'simpleTools'); $config->testtask->datatable = new stdclass(); $config->testtask->datatable->defaultField = array('id', 'pri', 'title', 'type', 'assignedTo', 'lastRunner', 'lastRunDate', 'lastRunResult', 'status', 'bugs', 'results', 'stepNumber','actions'); From ca73b53436e77bd968a65e0b47a1237bb7ff955e Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Fri, 7 Aug 2020 17:31:13 +0800 Subject: [PATCH 7/8] * Finish task #7613. --- module/story/lang/de.php | 2 +- module/story/lang/en.php | 2 +- module/story/lang/zh-cn.php | 2 +- module/story/lang/zh-tw.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/story/lang/de.php b/module/story/lang/de.php index 86cd133eec..476e18cde9 100644 --- a/module/story/lang/de.php +++ b/module/story/lang/de.php @@ -225,7 +225,7 @@ $lang->story->errorNotSubdivide = "If the status is not active, or the stage $lang->story->mustChooseResult = 'Ergebnis wählen'; $lang->story->mustChoosePreVersion = 'Version wählen um es umzukhren.'; $lang->story->noStory = 'Keine Storys. '; -$lang->story->ignoreChangeStage = 'Story %s is a draft. Please review it..'; +$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. Please review it..'; $lang->story->cannotDeleteParent = "Can not delete parent {$lang->storyCommon}"; $lang->story->moveChildrenTips = "Its Child {$lang->storyCommon} will be moved to the selected product when editing the linked product of Parent {$lang->storyCommon}."; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 09ff7bfb45..feb8d866d7 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -225,7 +225,7 @@ $lang->story->errorNotSubdivide = "If the status is not active, or the stage $lang->story->mustChooseResult = 'Select Result'; $lang->story->mustChoosePreVersion = 'Select a version to revert to.'; $lang->story->noStory = 'No stories yet. '; -$lang->story->ignoreChangeStage = 'Story %s is a draft. Please review it..'; +$lang->story->ignoreChangeStage = 'Story %s is in Draft or Closed status. Please review it..'; $lang->story->cannotDeleteParent = "Can not delete parent {$lang->storyCommon}"; $lang->story->moveChildrenTips = "Its Child {$lang->storyCommon} will be moved to the selected product when editing the linked product of Parent {$lang->storyCommon}."; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index f8b8c655c4..3cb5bd631b 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -225,7 +225,7 @@ $lang->story->errorNotSubdivide = "状态不是激活，或者阶段不是 $lang->story->mustChooseResult = '必须选择评审结果'; $lang->story->mustChoosePreVersion = '必须选择回溯的版本'; $lang->story->noStory = "暂时没有{$lang->storyCommon}。"; -$lang->story->ignoreChangeStage = "{$lang->storyCommon} %s 为草稿状态，没有修改其阶段。"; +$lang->story->ignoreChangeStage = "{$lang->storyCommon} %s 为草稿状态或已关闭状态，没有修改其阶段。"; $lang->story->cannotDeleteParent = "不能删除父{$lang->storyCommon}"; $lang->story->moveChildrenTips = "修改父{$lang->storyCommon}的所属产品会将其下的子{$lang->storyCommon}也移动到所选产品下。"; diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php index 4c12730a9b..26eeea5c62 100644 --- a/module/story/lang/zh-tw.php +++ b/module/story/lang/zh-tw.php @@ -225,7 +225,7 @@ $lang->story->errorNotSubdivide = "狀態不是激活，或者階段不是 $lang->story->mustChooseResult = '必須選擇評審結果'; $lang->story->mustChoosePreVersion = '必須選擇回溯的版本'; $lang->story->noStory = "暫時沒有{$lang->storyCommon}。"; -$lang->story->ignoreChangeStage = "{$lang->storyCommon} %s 為草稿狀態，沒有修改其階段。"; +$lang->story->ignoreChangeStage = "{$lang->storyCommon} %s 為草稿狀態或已關閉狀態，沒有修改其階段。"; $lang->story->cannotDeleteParent = "不能刪除父{$lang->storyCommon}"; $lang->story->moveChildrenTips = "修改父{$lang->storyCommon}的所屬產品會將其下的子{$lang->storyCommon}也移動到所選產品下。"; From a890c2407773468d6749fe9f6288800a468cd1f7 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Fri, 7 Aug 2020 17:31:38 +0800 Subject: [PATCH 8/8] * Finish task #7614. --- module/productplan/control.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/productplan/control.php b/module/productplan/control.php index bd36167615..6e782c3e99 100644 --- a/module/productplan/control.php +++ b/module/productplan/control.php @@ -266,8 +266,8 @@ class productplan extends control $this->commonAction($plan->product, $plan->branch); $products = $this->product->getPairs(); - $bugPager = new pager($type == 'bug' ? $recTotal : 0, $recPerPage, $type == 'bug' ? $pageID : 1); - $storyPager = new pager($type == 'story' ? $recTotal : 0, $recPerPage, $type == 'story' ? $pageID : 1); + $bugPager = new pager(0, $recPerPage, $type == 'bug' ? $pageID : 1); + $storyPager = new pager(0, $recPerPage, $type == 'story' ? $pageID : 1); $planStories = $this->loadModel('story')->getPlanStories($planID, 'all', $type == 'story' ? $sort : 'id_desc', $storyPager); if($reSort) {