Merge branch 'master' of https://github.com/easysoft/zentaopms

module/common/lang/zh-cn.php

@@ -574,6 +574,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyStory')
 
     /* Adjust sub menu of product module. */
     unset($lang->product->menu->project);
+    unset($lang->product->menu->doc);
     
     /* Rename product module. */
     $lang->menu->product = '产品|product|index';
@@ -609,6 +610,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTask')
     unset($lang->project->menu->bug);
     unset($lang->project->menu->testtask);
     unset($lang->project->menu->product);
+    unset($lang->project->menu->doc);
 
     /* Remove sub menu of product module. */
     unset($lang->product->menu);

module/doc/js/common.js

@@ -228,7 +228,7 @@ $(document).ready(function()
 
     $('.libs-group').sortable(
     {
-        trigger:  '.icon-move',
+        trigger:  '.lib',
         selector: '.lib',
         finish:   function() 
         {

module/product/lang/en.php

@@ -83,7 +83,7 @@ $lang->product->typeList['platform'] = 'Multi Platform';
 
 $lang->product->typeTips = array();
 $lang->product->typeTips['branch']   = '(Generally used to divide the custom content of different users)';
-$lang->product->typeTips['platform'] = '(Generally used to divide ios, Andrews, pc side, server and so on)';
+$lang->product->typeTips['platform'] = '(Generally used to divide ios, Andrews, pc and so on)';
 
 $lang->product->branchName['normal']   = '';
 $lang->product->branchName['branch']   = 'Branch';

module/product/lang/zh-cn.php

@@ -82,8 +82,8 @@ $lang->product->typeList['branch']   = '多分支';
 $lang->product->typeList['platform'] = '多平台';
 
 $lang->product->typeTips = array();
-$lang->product->typeTips['branch']   = '(一般用于划分不同用户的定制内容)';
-$lang->product->typeTips['platform'] = '(一般用于划分ios、安卓、pc端、服务器端等)';
+$lang->product->typeTips['branch']   = '(适用于客户定制场景)';
+$lang->product->typeTips['platform'] = '(适用于跨平台应用开发，比如ios、安卓、pc端等)';
 
 $lang->product->branchName['normal']   = '';
 $lang->product->branchName['branch']   = '分支';

module/product/model.php

@@ -22,7 +22,7 @@ class productModel extends model
      * @access public
      * @return void
      */
-    public function setMenu($products, $productID, $branch = 0, $extra = '')
+    public function setMenu($products, $productID, $branch = 0, $module = 0, $moduleType = '', $extra = '')
     {
         /* Has access privilege?. */
         if($products and !isset($products[$productID]) and !$this->checkPriv($this->getById($productID)))
@@ -44,7 +44,7 @@ class productModel extends model
         }
         if($currentMethod == 'report') $currentMethod = 'browse';
 
-        $selectHtml = $this->select($products, $productID, $currentModule, $currentMethod, $extra, $branch);
+        $selectHtml = $this->select($products, $productID, $currentModule, $currentMethod, $extra, $branch, $module, $moduleType);
         foreach($this->lang->product->menu as $key => $menu)
         {
             $replace = $key == 'list' ? $selectHtml : $productID;
@@ -63,7 +63,7 @@ class productModel extends model
      * @access public
      * @return string
      */
-    public function select($products, $productID, $currentModule, $currentMethod, $extra = '', $branch = 0)
+    public function select($products, $productID, $currentModule, $currentMethod, $extra = '', $branch = 0, $module = 0, $moduleType = '')
     {
         if(!$productID)
         {
@@ -94,6 +94,22 @@ class productModel extends model
                 $output .= "<a id='currentBranch' href=\"javascript:showSearchMenu('branch', '$productID', '$currentModule', '$currentMethod', '$extra')\">{$branchName} <span class='icon-caret-down'></span></a><div id='currentBranchDropMenu' class='hidden affix enter-from-bottom layer'></div>";
             }
         }
+
+        if($this->config->global->flow == 'onlyTest' and $moduleType)
+        {
+            $modules    = $this->loadModel('tree')->getModulePairs($productID, $moduleType);
+            $moduleName = ($module && isset($modules[$module])) ? $modules[$module] : $this->lang->tree->all;
+            if(!$isMobile)
+            {
+                $output .= '</li><li>';
+                $output .= "<a id='currentModule' href=\"javascript:showSearchMenu('tree', '$productID', '$currentModule', '$currentMethod', '$extra')\">{$moduleName} <span class='icon-caret-down'></span></a><div id='dropMenu'><i class='icon icon-spin icon-spinner'></i></div>";
+            }
+            else
+            {
+                $output .= "<a id='currentModule' href=\"javascript:showSearchMenu('tree', '$productID', '$currentModule', '$currentMethod', '$extra')\">{$moduleName} <span class='icon-caret-down'></span></a><div id='currentBranchDropMenu' class='hidden affix enter-from-bottom layer'></div>";
+            }
+        }
+
         return $output;
     }
 

module/story/config.php

@@ -39,7 +39,7 @@ $config->story->list->exportFields      = '
 
 $config->story->list->customCreateFields      = 'source,verify,pri,estimate,mailto,keywords';
 $config->story->list->customBatchCreateFields = 'module,plan,spec,source,verify,pri,estimate,review,keywords';
-$config->story->list->customBatchEditFields   = 'module,plan,estimate,pri,assignedTo,source,stage,closedBy,closedReason,keywords';
+$config->story->list->customBatchEditFields   = 'branch,module,plan,estimate,pri,assignedTo,source,stage,closedBy,closedReason,keywords';
 
 $config->story->custom = new stdclass();
 $config->story->custom->createFields      = $config->story->list->customCreateFields;