From 7d73cbb545dc681231251e9144d5ac38f8367ffe Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Thu, 1 Apr 2021 16:21:12 +0800
Subject: [PATCH 03/10] * Fix bug #11702.
---
module/testtask/control.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/module/testtask/control.php b/module/testtask/control.php
index d898d073bf..aacf722e68 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -665,7 +665,8 @@ class testtask extends control
$this->executeHooks($taskID);
- $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->session->testtaskList));
+ $link = isonlybody() ? 'parent' : $this->session->testtaskList;
+ $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $link));
}
/* Set menu. */
From 48706314d7c0366aea19f6ed8cedc2fadb6d4bd9 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Thu, 1 Apr 2021 16:25:14 +0800
Subject: [PATCH 04/10] * Fix bug.
---
module/upgrade/control.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index 36f44484c7..5eeab871e8 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -455,7 +455,7 @@ class upgrade extends control
if($project) $sprint->projects[$project->id] = $project->name;
}
- if(!isset($sprint->projects)) $sprint->projects = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('type')->eq('program')->fetchPairs();
+ if(!isset($sprint->projects)) $sprint->projects = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('type')->eq('project')->fetchPairs();
}
$this->view->noMergedSprints = $noMergedSprints;
From de99085844663dd9f4cf7e0ba4872ac974fc5402 Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Thu, 1 Apr 2021 16:43:01 +0800
Subject: [PATCH 05/10] * Fix bug #11699.
---
module/story/js/common.js | 2 +-
module/story/view/batchedit.html.php | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/module/story/js/common.js b/module/story/js/common.js
index 6590164006..ae8b0f947b 100644
--- a/module/story/js/common.js
+++ b/module/story/js/common.js
@@ -4,7 +4,7 @@ $(function()
if(typeof(storyType) == 'undefined') storyType = '';
if(typeof(rawModule) == 'undefined') rawModule = 'product';
if(typeof(execution) != 'undefined') rawModule = 'projectstory';
- if(['project', 'projectstory'].indexOf(rawModule) === -1)
+ if(['project', 'projectstory'].indexOf(rawModule) === -1 && app != 'qa')
{
$('#navbar .nav li').removeClass('active');
$("#navbar .nav li[data-id=" + storyType + ']').addClass('active');
diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php
index 9d003aad3a..1cbef6ed59 100644
--- a/module/story/view/batchedit.html.php
+++ b/module/story/view/batchedit.html.php
@@ -13,6 +13,7 @@
lang->story->dittoNotice);?>
+app->openApp);?>
From 82cc3f6ce4e4841b2a2dcbfeccc14b9b6c1b73e8 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Thu, 1 Apr 2021 17:12:59 +0800
Subject: [PATCH 06/10] * Finish task #37015.
---
.../block/view/projectstatisticblock.html.php | 57 +++++++++++--------
module/project/model.php | 5 +-
2 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php
index 31ff3874e9..481ad6f6bb 100644
--- a/module/block/view/projectstatisticblock.html.php
+++ b/module/block/view/projectstatisticblock.html.php
@@ -22,7 +22,7 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po
.block-statistic .tile {margin-bottom: 30px;}
.block-statistic .tile-title {font-size: 18px; color: #A6AAB8;}
.block-statistic .tile-amount {font-size: 48px; margin-bottom: 10px;}
-.block-statistic .col-nav {border-right: 1px solid #EBF2FB; width: 260px; padding: 0;}
+.block-statistic .col-nav {border-right: 1px solid #EBF2FB; width: 210px; padding: 0;}
.block-statistic .nav-secondary > li {position: relative;}
.block-statistic .nav-secondary > li > a {font-size: 14px; color: #838A9D; position: relative; box-shadow: none; padding-left: 20px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; transition: all .2s;}
.block-statistic .nav-secondary > li > a:first-child {padding-right: 36px;}
@@ -64,20 +64,21 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po
.status-count tr:first-child td:last-child {color: #000; font-weight: bold;}
.block-statistic .project-info {margin-left: 3px;}
+.block-statistic .project-budget {white-space: nowrap;}
.block-statistic .progress-group {margin-top: 10px;}
.block-statistic .progress-group .col {padding-left: 0;}
-.block-statistic .progress-percent {top: 4px;}
+.block-statistic .progress-percent {margin-top: 4px;}
.block-statistic .weekly-title {font-weight: bold; color: #3C4253;}
.block-statistic .weekly-small {font-size:12px; color: #838A9D;}
.block-statistic .weekly-progress {font-weight: bold; font-size:24px;}
.block-statistic .weekly-name {font-size: 14px; color: #838A9D;}
.block-statistic .weekly-value {font-size: 14px;}
.block-statistic .col-12 .stage {margin-left: 10px;}
-.block-statistic .col-12 .waterfall-title {padding-top: 5px;}
+.block-statistic .col-12 .waterfall-title {padding-top: 3px;}
.block-statistic .col-12 .waterfall-value {padding-top: 10px; font-size: 18px; font-weight: 600;}
.block-statistic .col-12 .waterfall-title .col {padding-right: 0px; padding-left: 0px;}
-.twenty-percent {width: 20%;}
+.forty-percent {width: 40%;}