From 391ac558249379ca25506395c2d6415832410216 Mon Sep 17 00:00:00 2001 From: holan20180123 Date: Tue, 20 Jul 2021 14:09:46 +0800 Subject: [PATCH 1/6] * Adjust executionCommon to projectCommon when upgrade. --- module/custom/model.php | 1 + module/upgrade/view/mergebyline.html.php | 2 +- module/upgrade/view/mergebyproduct.html.php | 2 +- module/upgrade/view/mergebysprint.html.php | 2 +- module/upgrade/view/mergeprogram.html.php | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/module/custom/model.php b/module/custom/model.php index 48af012607..6b88d34694 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -691,6 +691,7 @@ class customModel extends model { $this->loadModel('setting'); $this->setting->setItem('system.custom.sprintConcept', $this->post->sprintConcept); + $this->setting->setItem('system.custom.productProject', '0_' . $this->post->sprintConcept); /* Change block title. */ $oldConfig = isset($this->config->custom->sprintConcept) ? $this->config->custom->sprintConcept : '0'; diff --git a/module/upgrade/view/mergebyline.html.php b/module/upgrade/view/mergebyline.html.php index fbd0255a9d..a623c75001 100644 --- a/module/upgrade/view/mergebyline.html.php +++ b/module/upgrade/view/mergebyline.html.php @@ -35,7 +35,7 @@
- +
diff --git a/module/upgrade/view/mergebyproduct.html.php b/module/upgrade/view/mergebyproduct.html.php index e7e9781ea4..00264ce5cf 100644 --- a/module/upgrade/view/mergebyproduct.html.php +++ b/module/upgrade/view/mergebyproduct.html.php @@ -16,7 +16,7 @@
- +
diff --git a/module/upgrade/view/mergebysprint.html.php b/module/upgrade/view/mergebysprint.html.php index 38540ca6d6..cb76631ebf 100644 --- a/module/upgrade/view/mergebysprint.html.php +++ b/module/upgrade/view/mergebysprint.html.php @@ -9,7 +9,7 @@
- +
diff --git a/module/upgrade/view/mergeprogram.html.php b/module/upgrade/view/mergeprogram.html.php index decaf826c6..71b65cd015 100644 --- a/module/upgrade/view/mergeprogram.html.php +++ b/module/upgrade/view/mergeprogram.html.php @@ -35,7 +35,7 @@ - + From c757f08599a9376750dfb9a65aa2c03bf237cd74 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 20 Jul 2021 14:18:06 +0800 Subject: [PATCH 2/6] * remove gitlab. --- module/bug/view/create.html.php | 8 -------- module/story/view/create.html.php | 8 -------- module/task/view/create.html.php | 14 +++----------- 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index 86a295d081..a742898300 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -26,7 +26,6 @@ js::set('isStepsTemplate', $isStepsTemplate); js::set('oldProjectID', $projectID); js::set('blockID', $blockID); js::set('moduleID', $moduleID); -js::set('gitlabProjects', $gitlabProjects); ?>
@@ -313,13 +312,6 @@ js::set('gitlabProjects', $gitlabProjects); - -
- - - - - diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index d35fd709bc..8e46723c86 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -17,7 +17,6 @@ story->placeholder); ?> - @@ -252,13 +251,6 @@ - - - - - - - diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index 0b8d9e51c4..7fbe4203be 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -15,7 +15,6 @@ id));?> -
@@ -80,13 +79,13 @@ type != 'ops'):?>
- @@ -240,13 +239,6 @@ - - - - - - - From f6c4075c55db2aa5b00b720010e5dfde97a85c99 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Tue, 20 Jul 2021 14:23:38 +0800 Subject: [PATCH 3/6] * Fix bug#13727. --- module/task/model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/task/model.php b/module/task/model.php index 9cfff79cde..020133c482 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1130,6 +1130,7 @@ class taskModel extends model $task->lastEditedBy = $this->app->user->account; $task->lastEditedDate = $now; $task->consumed = $oldTask->consumed; + $task->parent = $oldTask->parent; if($oldTask->name != $task->name || $oldTask->estStarted != $task->estStarted || $oldTask->deadline != $task->deadline) { @@ -1257,7 +1258,7 @@ class taskModel extends model ->checkIF($task->estimate != false, 'estimate', 'float') ->checkIF($task->consumed != false, 'consumed', 'float') ->checkIF($task->left != false, 'left', 'float') - ->checkIF($task->left == 0 and $task->status != 'cancel' and $task->status != 'closed' and $task->status != 'wait' and $task->consumed != 0, 'status', 'equal', 'done') + ->checkIF($task->parent > 0 and $task->left == 0 and $task->status != 'cancel' and $task->status != 'closed' and $task->status != 'wait' and $task->consumed != 0, 'status', 'equal', 'done') ->batchCheckIF($task->status == 'wait' or $task->status == 'doing', 'finishedBy, finishedDate,canceledBy, canceledDate, closedBy, closedDate, closedReason', 'empty') From 68c2583a38bf6042ffec3ce884b32bbf4eb2f233 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 20 Jul 2021 14:35:56 +0800 Subject: [PATCH 4/6] * change AUTHORIZATION to TOKEN. --- framework/base/router.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/base/router.class.php b/framework/base/router.class.php index 26577a1839..13c8bbd635 100644 --- a/framework/base/router.class.php +++ b/framework/base/router.class.php @@ -852,7 +852,7 @@ class baseRouter if(!defined('SESSION_STARTED')) { /* If request header has token, use it as session for authentication. */ - if(isset($_SERVER['HTTP_AUTHORIZATION'])) session_id($_SERVER['HTTP_AUTHORIZATION']); + if(isset($_SERVER['HTTP_TOKEN'])) session_id($_SERVER['HTTP_TOKEN']); $sessionName = $this->config->sessionVar; session_name($sessionName); From 56d0edbf4b6f9f670f145a7873278c3c1f252c2b Mon Sep 17 00:00:00 2001 From: holan20180123 Date: Tue, 20 Jul 2021 14:42:57 +0800 Subject: [PATCH 5/6] * Fix update mode. --- module/custom/control.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/custom/control.php b/module/custom/control.php index c8ba0d2873..abc1b85ea2 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -551,6 +551,7 @@ class custom extends control if($mode == 'new') { if($sprintConcept == 2) $this->setting->setItem('system.custom.sprintConcept', 1); + if($sprintConcept == 1) $this->setting->setItem('system.custom.sprintConcept', 0); die(js::locate($this->createLink('upgrade', 'mergeTips'), 'parent')); } else From 824f465f8e45853dc9d10de3f36dfce5ca89148e Mon Sep 17 00:00:00 2001 From: holan20180123 Date: Tue, 20 Jul 2021 14:44:10 +0800 Subject: [PATCH 6/6] * Adjust update mode. --- module/custom/control.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/custom/control.php b/module/custom/control.php index abc1b85ea2..3f7af07206 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -556,6 +556,7 @@ class custom extends control } else { + if($sprintConcept == 0) $this->setting->setItem('system.custom.sprintConcept', 1); if($sprintConcept == 1) $this->setting->setItem('system.custom.sprintConcept', 2); die(js::reload('top')); }
executionCommon;?>projectCommon;?> upgrade->selectProject;?>
task->sync2Gitlab;?>
bug->status;?>
story->sync2Gitlab;?>
task->story;?> - task->noticeLinkStory, html::a($this->createLink('execution', 'linkStory', "executionID=$execution->id"), $lang->execution->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?> + + task->noticeLinkStory, html::a($this->createLink('execution', 'linkStory', "executionID=$execution->id"), $lang->execution->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?>
story => empty($stories) ? '': $stories[$task->story]), $task->story, "class='form-control chosen' onchange='setStoryRelated();'");?> preview;?>
- +
task->sync2Gitlab;?>
task->afterSubmit;?> task->afterChoices, !empty($task->id) ? 'toTaskList' : 'continueAdding');?>