Merge branch 'sprint/170_mayue_43892' into 'sprint/170'

* Finish task #43892.

See merge request easycorp/zentaopms!410

module/datatable/lang/zh-cn.php

@@ -21,7 +21,7 @@ $lang->datatable->platform = '平台';
 $lang->datatable->moduleSetting          = '模块设置';
 $lang->datatable->listSetting            = '列表设置';
 $lang->datatable->showModule             = '列表页是否显示模块名';
-$lang->datatable->showBranch             = '列表页是否显示分支名';
+$lang->datatable->showBranch             = '列表页是否显示%s名';
 $lang->datatable->showAllModule          = '是否显示完整产品模块';
 $lang->datatable->showModuleList[]       = '不显示';
 $lang->datatable->showModuleList['base'] = '只显示一级模块';

module/product/control.php

@@ -211,6 +211,12 @@ class product extends control
 
         $product = $this->product->getById($productID);
 
+        if($product->type != 'normal')
+        {
+            $this->app->loadLang('datatable');
+            $this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);
+        }
+        
         /* Get stories. */
         if($this->app->rawModule == 'projectstory')
         {

module/product/js/browse.js

@@ -1,5 +1,7 @@
 $(function()
 {
+    if(productType == 'normal') $('.table-form>tbody>tr').next().addClass('hidden');
+
     if(typeof(rawModule) == 'undefined') rawModule = 'product';
     if(rawModule != 'projectstory')
     {

module/product/view/browse.html.php

@@ -23,6 +23,7 @@ body {margin-bottom: 25px;}
 <?php js::set('projectID', $projectID);?>
 <?php js::set('branch', $branch);?>
 <?php js::set('rawModule', $this->app->rawModule);?>
+<?php js::set('productType', $product->type);?>
 <?php
 $unfoldStories = isset($config->product->browse->unfoldStories) ? json_decode($config->product->browse->unfoldStories, true) : array();
 $unfoldStories = zget($unfoldStories, $productID, array());