diff --git a/module/product/model.php b/module/product/model.php index a71518aca7..33d81fcbb8 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -2311,6 +2311,10 @@ class productModel extends model $objectID = $module == 'project' ? 'projectID' : 'executionID'; return helper::createLink($module, $method, "$objectID=$extra&productID=%s"); } + elseif($module == 'feedback') + { + return helper::createLink($module, $method, "browseType=byProduct&productID=%s"); + } return $link; } diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php index 81b430e4d9..4147879cbe 100644 --- a/module/product/view/ajaxgetdropmenu.html.php +++ b/module/product/view/ajaxgetdropmenu.html.php @@ -29,6 +29,7 @@ div#closed {width: 90px; height: 25px; line-height: 25px; background-color: #ddd; color: #3c495c; text-align: center; margin-left: 15px; border-radius: 2px;} #gray-line {width: 230px; height: 1px; margin-left: 10px; margin-bottom:2px; background-color: #ddd;} #swapper li >.selected {color: #0c64eb!important;background: #e9f2fb!important;} +#dropMenu .col-footer .selected{color: #2e7fff!important;background: #e6f0ff!important; padding: 1px 10px;border-radius: 4px;} '; ' . $lang->product->all, '', 'class="not-list-item"'); ?> ' . $lang->project->all, '', 'class="not-list-item"'); ?> product->closed?> + app->tab == 'feedback'):?> + + product->all, '', "class='not-list-item pull-left toggle-left-col $selected'"); ?> +
diff --git a/module/tree/control.php b/module/tree/control.php index 9f306f3fa5..fd5cd84e2a 100644 --- a/module/tree/control.php +++ b/module/tree/control.php @@ -48,7 +48,8 @@ class tree extends control else if($this->app->tab == 'feedback') { $products = $this->loadModel('feedback')->getGrantProducts(); - if($viewType == 'feedback') $this->lang->modulePageNav = $this->product->select($products, $rootID, 'tree', 'browse', 'feedback', '', '', '', false); + if(!$rootID) $rootID = key($products); + $this->loadModel('feedback')->setMenu($rootID); } /* According to the type, set the module root and modules. */ diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php index 1c6c9a6a11..9050ff21e9 100755 --- a/module/tree/lang/zh-cn.php +++ b/module/tree/lang/zh-cn.php @@ -50,6 +50,7 @@ $lang->tree->successSave = '成功保存'; $lang->tree->successFixed = '成功修正数据!'; $lang->tree->repeatName = '模块名“%s”已经存在!'; $lang->tree->shouldNotBlank = '模块名不能为空格!'; +$lang->tree->syncProductModule = '同步产品模块'; $lang->tree->module = '模块'; $lang->tree->name = '模块名称'; diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index 938817f53e..bb99d086ca 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -105,6 +105,8 @@ if($viewType == 'doc' or $viewType == 'api') + +