From a1c8888cf49d15ba2fea519a23d41faf0abdd86c Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 31 Jul 2019 13:43:51 +0800 Subject: [PATCH 1/2] * code for task #8280. --- module/block/view/productstatisticblock.html.php | 2 +- module/bug/control.php | 1 + module/product/control.php | 1 + module/project/control.php | 1 + module/story/control.php | 2 ++ module/task/control.php | 1 + module/testcase/control.php | 1 + module/todo/control.php | 1 + 8 files changed, 9 insertions(+), 1 deletion(-) diff --git a/module/block/view/productstatisticblock.html.php b/module/block/view/productstatisticblock.html.php index 6de4f89c30..2d247b3af1 100644 --- a/module/block/view/productstatisticblock.html.php +++ b/module/block/view/productstatisticblock.html.php @@ -26,7 +26,7 @@ .product-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 100px;} html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 90px;} .product-info .type-value, -.product-info .type-label {font-size: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} +.product-info .type-label {font-size: 12px; overflow: visible; text-overflow: ellipsis; white-space: nowrap;} .product-info .type-value {font-size: 14px;} .product-info .type-value > strong {font-size: 20px; color: #3C4353;} .product-info .actions {position: absolute; left: 10px; top: 14px;} diff --git a/module/bug/control.php b/module/bug/control.php index e9d07487fc..34a509140f 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -1591,6 +1591,7 @@ class bug extends control } if(!(in_array('platform', $productsType) or in_array('branch', $productsType))) unset($fields['branch']);// If products's type are normal, unset branch field. + if(isset($this->config->bizVersion)) list($fields, $bugs) = $this->loadModel('workflowfield')->appendDataFromFlow($this->app->getModuleName(), $fields, $bugs); $this->post->set('fields', $fields); $this->post->set('rows', $bugs); diff --git a/module/product/control.php b/module/product/control.php index 09a734b5b9..da649e4037 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -739,6 +739,7 @@ class product extends control if(strpos(",$checkedItem,", ",{$product->id},") === false) unset($productStats[$i]); } } + if(isset($this->config->bizVersion)) list($fields, $productStats) = $this->loadModel('workflowfield')->appendDataFromFlow($this->app->getModuleName(), $fields, $productStats); $this->post->set('fields', $fields); $this->post->set('rows', $productStats); diff --git a/module/project/control.php b/module/project/control.php index 3fd675c5d6..27a27716b1 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -2292,6 +2292,7 @@ class project extends control if(strpos(",$checkedItem,", ",{$project->id},") === false) unset($projectStats[$i]); } } + if(isset($this->config->bizVersion)) list($fields, $projectStats) = $this->loadModel('workflowfield')->appendDataFromFlow($this->app->getModuleName(), $fields, $projectStats); $this->post->set('fields', $fields); $this->post->set('rows', $projectStats); diff --git a/module/story/control.php b/module/story/control.php index 100ccea897..8c655b6b8f 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -1654,6 +1654,8 @@ class story extends control } if(!(in_array('platform', $productsType) or in_array('branch', $productsType))) unset($fields['branch']);// If products's type are normal, unset branch field. + if(isset($this->config->bizVersion)) list($fields, $stories) = $this->loadModel('workflowfield')->appendDataFromFlow($this->app->getModuleName(), $fields, $stories); + $this->post->set('fields', $fields); $this->post->set('rows', $stories); $this->post->set('kind', 'story'); diff --git a/module/task/control.php b/module/task/control.php index 441e672237..c332c22d92 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -1490,6 +1490,7 @@ class task extends control } } } + if(isset($this->config->bizVersion)) list($fields, $tasks) = $this->loadModel('workflowfield')->appendDataFromFlow($this->app->getModuleName(), $fields, $tasks); $this->post->set('fields', $fields); $this->post->set('rows', $tasks); diff --git a/module/testcase/control.php b/module/testcase/control.php index ec5ae4e553..9fc72a309e 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -1240,6 +1240,7 @@ class testcase extends control $case->linkCase = join("; \n", $tmpLinkCases); } } + if(isset($this->config->bizVersion)) list($fields, $cases) = $this->loadModel('workflowfield')->appendDataFromFlow($this->app->getModuleName(), $fields, $cases); $this->post->set('fields', $fields); $this->post->set('rows', $cases); diff --git a/module/todo/control.php b/module/todo/control.php index c64bade578..81b8558869 100644 --- a/module/todo/control.php +++ b/module/todo/control.php @@ -528,6 +528,7 @@ class todo extends control unset($todo->idvalue); unset($todo->private); } + if(isset($this->config->bizVersion)) list($fields, $todos) = $this->loadModel('workflowfield')->appendDataFromFlow($this->app->getModuleName(), $fields, $todos); $this->post->set('fields', $fields); $this->post->set('rows', $todos); From de7d71945901e5ac62ef78f0cc2fe4c1e6c506de Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 31 Jul 2019 14:03:00 +0800 Subject: [PATCH 2/2] * adjust for task #8280. --- module/bug/control.php | 2 +- module/product/control.php | 2 +- module/project/control.php | 2 +- module/story/control.php | 2 +- module/task/control.php | 2 +- module/testcase/control.php | 2 +- module/todo/control.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/module/bug/control.php b/module/bug/control.php index 34a509140f..1e3432bf67 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -1591,7 +1591,7 @@ class bug extends control } if(!(in_array('platform', $productsType) or in_array('branch', $productsType))) unset($fields['branch']);// If products's type are normal, unset branch field. - if(isset($this->config->bizVersion)) list($fields, $bugs) = $this->loadModel('workflowfield')->appendDataFromFlow($this->app->getModuleName(), $fields, $bugs); + if(isset($this->config->bizVersion)) list($fields, $bugs) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $bugs); $this->post->set('fields', $fields); $this->post->set('rows', $bugs); diff --git a/module/product/control.php b/module/product/control.php index da649e4037..e8fda11f42 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -739,7 +739,7 @@ class product extends control if(strpos(",$checkedItem,", ",{$product->id},") === false) unset($productStats[$i]); } } - if(isset($this->config->bizVersion)) list($fields, $productStats) = $this->loadModel('workflowfield')->appendDataFromFlow($this->app->getModuleName(), $fields, $productStats); + if(isset($this->config->bizVersion)) list($fields, $productStats) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $productStats); $this->post->set('fields', $fields); $this->post->set('rows', $productStats); diff --git a/module/project/control.php b/module/project/control.php index 27a27716b1..ec748ad826 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -2292,7 +2292,7 @@ class project extends control if(strpos(",$checkedItem,", ",{$project->id},") === false) unset($projectStats[$i]); } } - if(isset($this->config->bizVersion)) list($fields, $projectStats) = $this->loadModel('workflowfield')->appendDataFromFlow($this->app->getModuleName(), $fields, $projectStats); + if(isset($this->config->bizVersion)) list($fields, $projectStats) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $projectStats); $this->post->set('fields', $fields); $this->post->set('rows', $projectStats); diff --git a/module/story/control.php b/module/story/control.php index 8c655b6b8f..b6478e7346 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -1654,7 +1654,7 @@ class story extends control } if(!(in_array('platform', $productsType) or in_array('branch', $productsType))) unset($fields['branch']);// If products's type are normal, unset branch field. - if(isset($this->config->bizVersion)) list($fields, $stories) = $this->loadModel('workflowfield')->appendDataFromFlow($this->app->getModuleName(), $fields, $stories); + if(isset($this->config->bizVersion)) list($fields, $stories) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $stories); $this->post->set('fields', $fields); $this->post->set('rows', $stories); diff --git a/module/task/control.php b/module/task/control.php index c332c22d92..7438014f28 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -1490,7 +1490,7 @@ class task extends control } } } - if(isset($this->config->bizVersion)) list($fields, $tasks) = $this->loadModel('workflowfield')->appendDataFromFlow($this->app->getModuleName(), $fields, $tasks); + if(isset($this->config->bizVersion)) list($fields, $tasks) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $tasks); $this->post->set('fields', $fields); $this->post->set('rows', $tasks); diff --git a/module/testcase/control.php b/module/testcase/control.php index 9fc72a309e..ba21052bd7 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -1240,7 +1240,7 @@ class testcase extends control $case->linkCase = join("; \n", $tmpLinkCases); } } - if(isset($this->config->bizVersion)) list($fields, $cases) = $this->loadModel('workflowfield')->appendDataFromFlow($this->app->getModuleName(), $fields, $cases); + if(isset($this->config->bizVersion)) list($fields, $cases) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $cases); $this->post->set('fields', $fields); $this->post->set('rows', $cases); diff --git a/module/todo/control.php b/module/todo/control.php index 81b8558869..1f2638062d 100644 --- a/module/todo/control.php +++ b/module/todo/control.php @@ -528,7 +528,7 @@ class todo extends control unset($todo->idvalue); unset($todo->private); } - if(isset($this->config->bizVersion)) list($fields, $todos) = $this->loadModel('workflowfield')->appendDataFromFlow($this->app->getModuleName(), $fields, $todos); + if(isset($this->config->bizVersion)) list($fields, $todos) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $todos); $this->post->set('fields', $fields); $this->post->set('rows', $todos);