From 2c709e02abd4575aa918df6a05b9c551654e0a6c Mon Sep 17 00:00:00 2001 From: daitingting Date: Wed, 23 Nov 2022 06:54:34 +0000 Subject: [PATCH 01/11] * Fix bug #30085. --- module/custom/control.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/module/custom/control.php b/module/custom/control.php index d45d135b28..a5e5aea3b4 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -634,9 +634,6 @@ class custom extends control $this->loadModel('setting')->setItem('system.common.global.mode', $mode); $this->setting->setItem('system.common.global.defaultProgram', $program); - /* Set default program for product and project with no program. */ - $this->loadModel('upgrade')->relateDefaultProgram($program); - $this->custom->disableFeaturesByMode($mode); if($mode == 'light') $this->custom->processProjectAcl(); From 58cb6d681d87c1af6c267a2204ed738732ee98bd Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Wed, 23 Nov 2022 14:57:01 +0800 Subject: [PATCH 02/11] * Fix bug#30163. --- module/testcase/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/testcase/control.php b/module/testcase/control.php index ecc80170e9..c7a8bec957 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -836,7 +836,7 @@ class testcase extends control $this->view->caseModule = empty($case->module) ? '' : $this->tree->getById($case->module); $this->view->users = $this->user->getPairs('noletter'); $this->view->actions = $this->loadModel('action')->getList('case', $caseID); - $this->view->preAndNext = $this->loadModel('common')->getPreAndNextObject('testcase', $caseID); + $this->view->preAndNext = !isOnlybody() ? $this->loadModel('common')->getPreAndNextObject('testcase', $caseID) : ''; $this->view->runID = $from == 'testcase' ? 0 : $run->id; $this->view->isLibCase = $isLibCase; $this->view->caseFails = $caseFails; From aa08e084e10c5959794cc709850a3faaa81c8264 Mon Sep 17 00:00:00 2001 From: wangyuting <851424971@qq.com> Date: Wed, 23 Nov 2022 07:24:40 +0000 Subject: [PATCH 03/11] * Optimize set module page css. --- module/admin/view/setmodule.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/admin/view/setmodule.html.php b/module/admin/view/setmodule.html.php index ef957bbde8..f24ad65a45 100644 --- a/module/admin/view/setmodule.html.php +++ b/module/admin/view/setmodule.html.php @@ -20,7 +20,7 @@ - + From 3afc82317760b640967b9650582a8f039f82e38b Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Wed, 23 Nov 2022 15:34:30 +0800 Subject: [PATCH 04/11] * Fix bug#29716,#30056. --- module/my/model.php | 6 +++--- module/projectrelease/view/edit.html.php | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/module/my/model.php b/module/my/model.php index d8424c070a..996f2c9137 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -351,7 +351,7 @@ class myModel extends model { $orderBy = (strpos($orderBy, 'priOrder') !== false or strpos($orderBy, 'severityOrder') !== false) ? $orderBy : "t1.$orderBy"; $nameField = $objectType == 'bug' ? 'productName' : 'productTitle'; - $select = "t1.*, t2.name AS {$nameField}, t2.shadow, " . (strpos($orderBy, 'severity') !== false ? "IF(t1.`severity` = 0, {$this->config->maxPriValue}, t1.`severity`) AS severityOrder" : "IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) AS priOrder"); + $select = "t1.*, t2.name AS {$nameField}, t2.shadow AS shadow, " . (strpos($orderBy, 'severity') !== false ? "IF(t1.`severity` = 0, {$this->config->maxPriValue}, t1.`severity`) AS severityOrder" : "IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) AS priOrder"); $objectList = $this->dao->select($select)->from($this->config->objectTables[$module])->alias('t1') ->leftJoin(TABLE_PRODUCT)->alias('t2')->on("t1.product = t2.id") ->where('t1.deleted')->eq(0) @@ -816,7 +816,7 @@ class myModel extends model $storyIDList[$storyID] = $storyID; } - $stories = $this->dao->select("distinct t1.*, IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) as priOrder, t2.name as productTitle, t4.title as planTitle")->from(TABLE_STORY)->alias('t1') + $stories = $this->dao->select("distinct t1.*, IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) as priOrder, t2.name as productTitle, t2.shadow as shadow, t4.title as planTitle")->from(TABLE_STORY)->alias('t1') ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id') ->leftJoin(TABLE_PLANSTORY)->alias('t3')->on('t1.id = t3.plan') ->leftJoin(TABLE_PRODUCTPLAN)->alias('t4')->on('t3.plan = t4.id') @@ -835,7 +835,7 @@ class myModel extends model } else { - $stories = $this->dao->select("distinct t1.*, IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) as priOrder, t2.name as productTitle, t4.title as planTitle")->from(TABLE_STORY)->alias('t1') + $stories = $this->dao->select("distinct t1.*, IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) as priOrder, t2.name as productTitle, t2.shadow as shadow, t4.title as planTitle")->from(TABLE_STORY)->alias('t1') ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id') ->leftJoin(TABLE_PLANSTORY)->alias('t3')->on('t1.id = t3.plan') ->leftJoin(TABLE_PRODUCTPLAN)->alias('t4')->on('t3.plan = t4.id') diff --git a/module/projectrelease/view/edit.html.php b/module/projectrelease/view/edit.html.php index ddccf35e5c..3374c74a78 100644 --- a/module/projectrelease/view/edit.html.php +++ b/module/projectrelease/view/edit.html.php @@ -27,6 +27,7 @@ + shadow):?> + From 4b9bc5727b9907211cf820d362731417402396ae Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Wed, 23 Nov 2022 07:45:11 +0000 Subject: [PATCH 05/11] * Adjust the changelog. --- doc/CHANGELOG | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 09e644ac64..85b6176b79 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,5 +1,6 @@ 2022-11-16 18.0.beta1 完成的需求 +开源版: 39874 瀑布项目设置中产品页面提示文案修改 39873 瀑布项目创建页面按产品创建阶段文案修改 39849 发布可以关联多个版本后，调整产品发布中关联软件需求的规则 @@ -338,6 +339,13 @@ 37635 在项目型项目下可以创建代码库 37465 在项目型项目下可以提交评审问题 37464 代码库可以关联项目 +企业版： +39500 反馈1.5级导航样式优化 +39123 工单增加导出数据功能 +38160 反馈的权限改名为设置 +37570 权限增加产品设置功能 +36930 反馈权限列表产品展示同产品列表 +禅道客户端： 36616 实现版本升级后原存档讨论组逻辑处理 36543 实现群主取消归档讨论组相关提醒及操作 36540 实现对已归档的讨论组限制移动分组 @@ -376,6 +384,12 @@ 27983 用户名大小写不对，提示有问题 27629 预览txt文件乱码 28095 LDAP密码有特殊字符无法登录 +30119 设计Bug解决表页面代码报错 +30057 输入方式的选中样式与文字不在同一水平线 +29661 透视表字段显示为英文 +29617 保存透视表时必填项未增加必填标识 +29367 点击分组维护主机、虚拟机二级导航高亮展示 +28580 统计-测试报表中有两个报表没有翻译德语和法语语言项 2022-11-02 17.8 完成的需求 From d76f5da2353466b557829ea81c9d3bc0aa5d1c36 Mon Sep 17 00:00:00 2001 From: zenggang Date: Wed, 23 Nov 2022 07:49:01 +0000 Subject: [PATCH 06/11] * Fix bug#26556 --- module/bug/model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index 4e0142328e..e24d83085f 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -2247,8 +2247,8 @@ class bugModel extends model if(!empty($stepResults)) { - $bugStep = ''; - $bugResult = ''; + $bugStep = ''; + $bugResult = isset($stepResults[0]) ? $stepResults[0]['real'] : ''; $bugExpect = ''; foreach($steps as $stepId) { From 40ee11ba305ffc0a2d90a3b51740fd456dd933ad Mon Sep 17 00:00:00 2001 From: lanzongjun Date: Wed, 23 Nov 2022 15:59:21 +0800 Subject: [PATCH 07/11] * Fix Bug #30157 --- module/project/view/edit.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index b120942e96..779ca44540 100755 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -104,7 +104,7 @@ budgetUnit);?> - budgetUnit, "class='form-control'");?> + budgetUnit, "class='form-control w-70px'");?> From 48d220972223f1791ee2c720228f17c781ffb70f Mon Sep 17 00:00:00 2001 From: daitingting Date: Wed, 23 Nov 2022 08:10:39 +0000 Subject: [PATCH 08/11] * Fix bug #30165,#30170. --- module/custom/css/mode.css | 1 + module/custom/lang/de.php | 4 ++-- module/custom/lang/en.php | 4 ++-- module/custom/lang/fr.php | 4 ++-- module/custom/view/mode.html.php | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/module/custom/css/mode.css b/module/custom/css/mode.css index bf17268b27..c1493fb200 100644 --- a/module/custom/css/mode.css +++ b/module/custom/css/mode.css @@ -3,4 +3,5 @@ #selectProgramModal .modal-header {border-bottom: 0px} #selectProgramModal .modal-header h4.modal-title{font-weight: 700} #selectProgramModal .modal-footer {border-top: 0px; text-align: center} +.main-table tbody > tr.select-mode:hover{background: unset;} .btn-wide {padding: 6px 85px;} diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php index 251a281cf6..08ca6762ba 100644 --- a/module/custom/lang/de.php +++ b/module/custom/lang/de.php @@ -267,8 +267,8 @@ $lang->custom->features['productLine'] = 'Product - Product Line'; $lang->custom->features['projectScrum'] = 'Project - Scrum model'; $lang->custom->features['projectWaterfall'] = 'Project - Waterfall model'; $lang->custom->features['projectKanban'] = 'Project - Kanban model'; -$lang->custom->features['execution'] = 'Execute'; -$lang->custom->features['qa'] = 'test'; +$lang->custom->features['execution'] = 'Execution'; +$lang->custom->features['qa'] = 'Test'; $lang->custom->features['devops'] = 'DevOps'; $lang->custom->features['kanban'] = 'Kanban'; $lang->custom->features['doc'] = 'Document'; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index aabacf04db..f094606d09 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -268,8 +268,8 @@ $lang->custom->features['projectScrum'] = 'Project - Scrum model'; $lang->custom->features['scrumDetail'] = 'Scrum - Issues, risks, opportunities, processes, QA, meetings, measure'; $lang->custom->features['projectWaterfall'] = 'Project - Waterfall model'; $lang->custom->features['projectKanban'] = 'Project - Kanban model'; -$lang->custom->features['execution'] = 'Execute'; -$lang->custom->features['qa'] = 'test'; +$lang->custom->features['execution'] = 'Execution'; +$lang->custom->features['qa'] = 'Test'; $lang->custom->features['devops'] = 'DevOps'; $lang->custom->features['kanban'] = 'Kanban'; $lang->custom->features['doc'] = 'Document'; diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php index 307740ec1e..9094363f73 100644 --- a/module/custom/lang/fr.php +++ b/module/custom/lang/fr.php @@ -267,8 +267,8 @@ $lang->custom->features['productLine'] = 'Product - Product Line'; $lang->custom->features['projectScrum'] = 'Project - Scrum model'; $lang->custom->features['projectWaterfall'] = 'Project - Waterfall model'; $lang->custom->features['projectKanban'] = 'Project - Kanban model'; -$lang->custom->features['execution'] = 'Execute'; -$lang->custom->features['qa'] = 'test'; +$lang->custom->features['execution'] = 'Execution'; +$lang->custom->features['qa'] = 'Test'; $lang->custom->features['devops'] = 'DevOps'; $lang->custom->features['kanban'] = 'Kanban'; $lang->custom->features['doc'] = 'Document'; diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php index 380ac74e1a..66f9547cdd 100644 --- a/module/custom/view/mode.html.php +++ b/module/custom/view/mode.html.php @@ -53,7 +53,7 @@ - +
admin->setModule->module;?>admin->setModule->module;?> admin->setModule->optional;?>
release->name;?> name, "class='form-control' required");?> marker) ? "checked='checked'" : '';?>
@@ -34,6 +35,7 @@
release->includedBuild;?>
lang->custom->selectUsage;?> From c0879ef983131ac94e726d437705ce3703011339 Mon Sep 17 00:00:00 2001 From: mayue Date: Wed, 23 Nov 2022 16:08:31 +0800 Subject: [PATCH 09/11] * Fix bug #30021. --- module/story/control.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/story/control.php b/module/story/control.php index 05b367bd7c..1f4128f858 100755 --- a/module/story/control.php +++ b/module/story/control.php @@ -1349,7 +1349,7 @@ class story extends control $product = $this->product->getByID($story->product); $plan = $this->dao->findById($story->plan)->from(TABLE_PRODUCTPLAN)->fetch('title'); $bugs = $this->dao->select('id,title,status,pri,severity')->from(TABLE_BUG)->where('story')->eq($storyID)->andWhere('deleted')->eq(0)->fetchAll(); - $fromBug = $this->dao->select('id,title')->from(TABLE_BUG)->where('toStory')->eq($storyID)->fetch(); + $fromBug = $this->dao->select('id,title')->from(TABLE_BUG)->where('id')->eq($story->fromBug)->fetch(); $cases = $this->dao->select('id,title,status,pri')->from(TABLE_CASE)->where('story')->eq($storyID)->andWhere('deleted')->eq(0)->fetchAll(); $linkedMRs = $this->loadModel('mr')->getLinkedMRPairs($storyID, 'story'); $modulePath = $this->tree->getParents($story->module); @@ -2366,7 +2366,7 @@ class story extends control $this->lang->story->title = str_replace($this->lang->URCommon, $this->lang->SRCommon, $this->lang->story->title); } - if(!empty($product->shadow)) + if(!empty($product->shadow)) { unset($this->config->product->search['fields']['plan']); unset($this->config->product->search['fields']['product']); From e6e37d4b20db662a644863410fa2f6a6a4df24c4 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Wed, 23 Nov 2022 16:17:01 +0800 Subject: [PATCH 10/11] * Fix bug#30032. --- module/bug/view/ajaxgetdropmenu.html.php | 2 +- module/product/model.php | 2 ++ module/testcase/control.php | 11 +++++++---- module/testcase/css/groupcase.css | 4 ++++ module/testcase/css/zerocase.css | 3 +++ module/testtask/control.php | 5 +++-- module/testtask/css/browseunits.css | 3 +++ 7 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 module/testcase/css/zerocase.css diff --git a/module/bug/view/ajaxgetdropmenu.html.php b/module/bug/view/ajaxgetdropmenu.html.php index af69f3582d..1e41d00e47 100644 --- a/module/bug/view/ajaxgetdropmenu.html.php +++ b/module/bug/view/ajaxgetdropmenu.html.php @@ -17,7 +17,7 @@ foreach($products as $product) } $productsPinYin = common::convert2Pinyin($productNames); $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, 0); -$productsHtml = count($products) > 1 ? html::a($linkHtml, $this->lang->bug->allProduct, '', "class='text-primary' title='{$this->lang->bug->allProduct}' data-key='" . zget($productsPinYin, $this->lang->bug->allProduct, '') . "' data-app='{$this->app->tab}'") : ''; +$productsHtml = (count($products) > 1 and strpos(',zeroCase,browseUnits,groupCase,', ",$method,") === false) ? html::a($linkHtml, $this->lang->bug->allProduct, '', "class='text-primary' title='{$this->lang->bug->allProduct}' data-key='" . zget($productsPinYin, $this->lang->bug->allProduct, '') . "' data-app='{$this->app->tab}'") : ''; foreach($products as $product) { diff --git a/module/product/model.php b/module/product/model.php index 549a4027ba..ada143a2d9 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -85,6 +85,8 @@ class productModel extends model if(empty($products)) return; + if($this->app->tab == 'project' and strpos(',zeroCase,browseUnits,groupCase,', ",$currentMethod,") !== false) $isQaModule = true; + $this->app->loadLang('product'); if(!$isQaModule and !$productID and !$isFeedbackModel) { diff --git a/module/testcase/control.php b/module/testcase/control.php index c7a8bec957..fb93f34117 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -245,6 +245,7 @@ class testcase extends control { $groupBy = empty($groupBy) ? 'story' : $groupBy; $productID = $this->product->saveState($productID, $this->products); + $product = $this->product->getByID($productID); if($branch === '') $branch = $this->cookie->preBranch; $this->app->loadLang('testtask'); @@ -253,7 +254,7 @@ class testcase extends control if($this->app->tab == 'project') { $products = array('0' => $this->lang->product->all) + $this->product->getProducts($this->session->project, 'all', '', false); - $this->lang->modulePageNav = $this->product->select($products, $productID, 'testcase', 'groupCase', "projectID=$projectID", $branch); + if(!$product->shadow) $this->lang->modulePageNav = $this->product->select($products, $productID, 'testcase', 'groupCase', "projectID=$projectID", $branch); } $this->session->set('caseList', $this->app->getURI(true), $this->app->tab); @@ -294,7 +295,7 @@ class testcase extends control $this->view->suiteID = 0; $this->view->moduleID = 0; $this->view->branch = $branch; - $this->view->product = $this->product->getByID($productID); + $this->view->product = $product; $this->display(); } @@ -323,12 +324,14 @@ class testcase extends control $this->loadModel('project')->setMenu($this->session->project); $products = $this->product->getProducts($this->session->project, 'all', '', false); $productID = $this->product->saveState($productID, $products); - $this->lang->modulePageNav = $this->product->select($products, $productID, 'testcase', 'zeroCase', "projectID=$projectID", $branchID); + $product = $this->product->getByID($productID); + if(!$product->shadow) $this->lang->modulePageNav = $this->product->select($products, $productID, 'testcase', 'zeroCase', "projectID=$projectID", $branchID); } else { $products = $this->product->getPairs(); $productID = $this->product->saveState($productID, $products); + $product = $this->product->getByID($productID); $this->loadModel('qa'); $this->app->rawModule = 'testcase'; foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa'; @@ -355,7 +358,7 @@ class testcase extends control $this->view->orderBy = $orderBy; $this->view->suiteList = $this->loadModel('testsuite')->getSuites($productID); $this->view->browseType = ''; - $this->view->product = $this->product->getByID($productID); + $this->view->product = $product; $this->view->pager = $pager; $this->display(); } diff --git a/module/testcase/css/groupcase.css b/module/testcase/css/groupcase.css index d71fbef76d..43d054bbf6 100644 --- a/module/testcase/css/groupcase.css +++ b/module/testcase/css/groupcase.css @@ -2,3 +2,7 @@ .group-header > a {line-height: 20px; display: block; max-height: 40px; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden;} .c-result {width: 80px;} .c-bugs, .c-results, .c-steps {width: 30px;} + +#subHeader #dropMenu .col-left .list-group {margin-bottom: 0px; padding-top: 10px;} +#subHeader #dropMenu .col-left {padding-bottom: 0px;} +#currentBranch + #dropMenu .col-left {padding-bottom: 30px;} diff --git a/module/testcase/css/zerocase.css b/module/testcase/css/zerocase.css new file mode 100644 index 0000000000..52b81c0521 --- /dev/null +++ b/module/testcase/css/zerocase.css @@ -0,0 +1,3 @@ +#subHeader #dropMenu .col-left .list-group {margin-bottom: 0px; padding-top: 10px;} +#subHeader #dropMenu .col-left {padding-bottom: 0px;} +#currentBranch + #dropMenu .col-left {padding-bottom: 30px;} diff --git a/module/testtask/control.php b/module/testtask/control.php index dd0111d1b5..b25782e1c9 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -155,6 +155,7 @@ class testtask extends control /* Set menu. */ $productID = $this->loadModel('product')->saveState($productID, $this->products); + $product = $this->product->getByID($productID); if($this->app->tab == 'project') { $this->lang->scrum->menu->qa['subMenu']->testcase['subModule'] = 'testtask'; @@ -167,7 +168,7 @@ class testtask extends control } $this->loadModel('project')->setMenu($projectID); - $this->lang->modulePageNav = $this->product->select($this->products, $productID, 'testtask', 'browseUnits', "projectID=$projectID", '', 0, '', false); + if(!$product->shadow) $this->lang->modulePageNav = $this->product->select($this->products, $productID, 'testtask', 'browseUnits', "projectID=$projectID", '', 0, '', false); } else { @@ -194,7 +195,7 @@ class testtask extends control $this->view->tasks = $this->testtask->getProductUnitTasks($productID, $browseType, $sort, $pager); $this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter'); $this->view->pager = $pager; - $this->view->product = $this->product->getByID($productID); + $this->view->product = $product; $this->view->suiteList = $this->loadModel('testsuite')->getSuites($productID); $this->display(); diff --git a/module/testtask/css/browseunits.css b/module/testtask/css/browseunits.css index 53e992bee1..843aaf11fe 100644 --- a/module/testtask/css/browseunits.css +++ b/module/testtask/css/browseunits.css @@ -1,2 +1,5 @@ td.pass {background-color: unset !important; border-color: unset !important; border-bottom: 1px solid #eee !important; color: green;} td.fail {background-color: unset !important; border-color: unset !important; border-bottom: 1px solid #eee !important; color: red;} + +#subHeader #dropMenu .col-left .list-group {margin-bottom: 0px; padding-top: 10px;} +#subHeader #dropMenu .col-left {padding-bottom: 0px;} From 9b70804cfd909763925aeda7285bf8440ac7836b Mon Sep 17 00:00:00 2001 From: liuhong Date: Wed, 23 Nov 2022 08:23:51 +0000 Subject: [PATCH 11/11] * Fix bug #30162. --- module/product/view/browse.html.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index deaa183c43..2876e7cfba 100755 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -20,6 +20,8 @@ body {margin-bottom: 25px;} .assignedTo{border-radius: 4px !important;} story->createCommon = $storyType == 'story' ? $lang->story->createStory : $lang->story->createRequirement; $unfoldStories = isset($config->product->browse->unfoldStories) ? json_decode($config->product->browse->unfoldStories, true) : array(); $unfoldStories = zget($unfoldStories, $productID, array()); @@ -401,7 +403,6 @@ js::set('vision', $this->config->vision);
product] = $story->product;