From 9d4900b30ef28afe063379afb2dfcd313b879ab2 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Sat, 20 Feb 2021 11:19:22 +0800 Subject: [PATCH 1/4] * Finish task #36014. --- module/custom/control.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/module/custom/control.php b/module/custom/control.php index 3cb9e1100f..002f401876 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -507,8 +507,13 @@ class custom extends control $lang = $this->app->getClientLang(); $this->custom->deleteItems("lang=$lang§ion=URSRList&key=$key"); + $defaultConcept = $this->dao->select('`value`')->from(TABLE_CONFIG) + ->where('module')->eq('custom') + ->andWhere('`key`')->eq('URSR') + ->fetch('value'); + $this->dao->update(TABLE_CONFIG) - ->set('`value`')->eq($this->config->URSR) + ->set('`value`')->eq($defaultConcept) ->where('module')->eq('common') ->andWhere('`key`')->eq('URSR') ->andWhere('`value`')->eq($key) From 3d67f9fc94f07a194f8c8bb41c8c2a7221eca16e Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Sat, 20 Feb 2021 11:27:52 +0800 Subject: [PATCH 2/4] * Finish task#36040. --- config/filter.php | 2 -- module/common/view/datatable.html.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/config/filter.php b/config/filter.php index 46fde65570..62947feb97 100644 --- a/config/filter.php +++ b/config/filter.php @@ -175,7 +175,6 @@ $filter->program->ajaxgetpgmdropmenu->cookie['showClosed'] = 'code'; $filter->project->default->cookie['lastProject'] = 'int'; $filter->project->default->cookie['lastPRJ'] = 'int'; $filter->project->default->cookie['projectMode'] = 'code'; -$filter->project->default->cookie['recentExecutions'] = 'code'; $filter->project->story->cookie['storyModuleParam'] = 'int'; $filter->project->story->cookie['storyPreProjectID'] = 'int'; $filter->project->story->cookie['storyProductParam'] = 'int'; @@ -186,7 +185,6 @@ $filter->project->task->cookie['preProjectID'] = 'int'; $filter->project->task->cookie['productBrowseParam'] = 'int'; $filter->project->task->cookie['projectTaskOrder'] = 'reg::orderBy'; $filter->project->task->cookie['windowWidth'] = 'int'; -$filter->project->task->cookie['recentExecutions'] = 'code'; $filter->project->export->cookie['checkedItem'] = 'reg::checked'; $filter->qa->default->cookie['lastProduct'] = 'int'; diff --git a/module/common/view/datatable.html.php b/module/common/view/datatable.html.php index 65b513da25..9de1d6f468 100644 --- a/module/common/view/datatable.html.php +++ b/module/common/view/datatable.html.php @@ -22,7 +22,7 @@ .datatable .flexarea tbody>tr.checked>td:first-child:before, .datatable .fixed-right tbody>tr.checked>td:first-child:before {display: none} .datatable>.scroll-wrapper {z-index: 10;} -.has-fixed-footer .scroll-wrapper {bottom: 89px; position: fixed;} +.has-fixed-footer .scroll-wrapper {bottom: 49px; position: fixed;} .has-fixed-footer .scroll-wrapper .scroll-slide.scroll-pos-out{height:8px;bottom: -8px;} .has-fixed-footer .scroll-wrapper .scroll-slide.scroll-pos-out .bar{height:8px;} .datatable .flexarea thead>tr>th:first-child, From 0721d6900ce6de9230e6675f0021b7a3015cecae Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Sat, 20 Feb 2021 13:22:33 +0800 Subject: [PATCH 3/4] * Finish task #36014. --- module/custom/control.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/module/custom/control.php b/module/custom/control.php index 002f401876..414aecfdfd 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -507,11 +507,7 @@ class custom extends control $lang = $this->app->getClientLang(); $this->custom->deleteItems("lang=$lang§ion=URSRList&key=$key"); - $defaultConcept = $this->dao->select('`value`')->from(TABLE_CONFIG) - ->where('module')->eq('custom') - ->andWhere('`key`')->eq('URSR') - ->fetch('value'); - + $defaultConcept = $this->loadModel('setting')->getItem('owner=system&module=custom&key=URSR'); $this->dao->update(TABLE_CONFIG) ->set('`value`')->eq($defaultConcept) ->where('module')->eq('common') From eba69aa8b783627597c29ea52d1889e3f75f6ee5 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Sat, 20 Feb 2021 13:26:00 +0800 Subject: [PATCH 4/4] * Finish task#36030.36047. --- module/upgrade/view/mergebyproduct.html.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/module/upgrade/view/mergebyproduct.html.php b/module/upgrade/view/mergebyproduct.html.php index a062ec39f7..72ae5d589c 100644 --- a/module/upgrade/view/mergebyproduct.html.php +++ b/module/upgrade/view/mergebyproduct.html.php @@ -1,4 +1,7 @@ - +
upgrade->mergeSummary, $noMergedProductCount, $noMergedSprintCount); @@ -9,26 +12,28 @@
-
upgrade->product;?>
+
upgrade->product;?>
upgrade->project;?>
+ $product):?>
- id => "{$lang->productCommon} #{$product->id} {$product->name}"), $product->id, "data-productid='{$product->id}' data-begin='{$product->createdDate}'");?> + id => "{$product->name}"), $isChecked ? $product->id : '', "data-productid='{$product->id}' data-begin='{$product->createdDate}'");?>
- id => "{$lang->upgrade->project} #{$sprint->id} {$sprint->name}"), $sprint->id, "data-product='{$productID}' data-begin='{$sprint->begin}' data-end='{$sprint->end}'");?> + id => "{$sprint->name}"), $isChecked ? $sprint->id : '', "data-product='{$productID}' data-begin='{$sprint->begin}' data-end='{$sprint->end}'");?> id]", $sprint->id);?>
+