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

config/zentaopms.php

@@ -23,7 +23,7 @@ $config->checkVersion = true;              // Auto check for new version or not.
 /* Set the wide window size and timeout(ms) and duplicate interval time(s). */
 $config->wideSize      = 1400;
 $config->timeout       = 30000;
-$config->duplicateTime = 60;
+$config->duplicateTime = 30;
 
 /* Product common list. */
 $config->productCommonList['zh-cn'][0] = '产品';

module/bug/control.php

@@ -88,8 +88,8 @@ class bug extends control
         if($browseType == 'bymodule') setcookie('bugModule', (int)$param, 0, $this->config->webRoot, '', false, false);
         if($browseType != 'bymodule') $this->session->set('bugBrowseType', $browseType);
 
-        $moduleID  = ($browseType == 'bymodule') ? (int)$param : ($browseType == 'bysearch' ? 0 : ($this->cookie->bugModule ? $this->cookie->bugModule : 0));
-        $queryID   = ($browseType == 'bysearch') ? (int)$param : 0;
+        $moduleID = ($browseType == 'bymodule') ? (int)$param : ($browseType == 'bysearch' ? 0 : ($this->cookie->bugModule ? $this->cookie->bugModule : 0));
+        $queryID  = ($browseType == 'bysearch') ? (int)$param : 0;
 
         /* Set menu and save session. */
         $this->bug->setMenu($this->products, $productID, $branch, $moduleID, $browseType, $orderBy);

module/bug/view/browse.html.php

@@ -51,6 +51,8 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
 
         $menuBrowseType = strpos($menuItem->name, 'QUERY') === 0 ? 'bySearch' : $menuItem->name;
         $label  = "<span class='text'>{$menuItem->text}</span>";
+        if($this->session->bugBrowseType == 'bysearch') $browseType = 'all';
+        if($this->session->bugBrowseType != 'bysearch' && $browseType == 'bymodule') $browseType = $this->session->bugBrowseType;
         $label .= $menuBrowseType == $browseType ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
         $active = $menuBrowseType == $browseType ? 'btn-active-text' : '';
 

module/ci/model.php

@@ -131,7 +131,6 @@ class ciModel extends model
     public function sendRequest($url, $data, $userPwd = '')
     {
         if(!empty($data->PARAM_TAG)) $data->PARAM_REVISION = '';
-
         $response = common::http($url, $data, true, $userPwd);
         if(preg_match("!Location: .*item/(.*)/!", $response, $matches)) return $matches[1];
         return 0;

module/compile/model.php

@@ -129,7 +129,7 @@ class compileModel extends model
         if(!$job) return false;
 
         $data = new stdclass();
-        $data->PARAM_TAG = $compile->tag;
+        $data->PARAM_TAG   = $compile->tag;
         $data->ZENTAO_DATA = "compile={$compile->id}";
 
         $buildUrl = $this->getBuildUrl($job);

module/product/view/browse.html.php

@@ -39,6 +39,7 @@ js::set('foldAll',       $lang->project->treeLevel['root']);
   </div>
   <div class="btn-toolbar pull-left">
     <?php
+    if($this->session->storyBrowseType == 'bysearch') $this->session->set('storyBrowseType', 'allstory');
     foreach(customModel::getFeatureMenu($this->moduleName, $this->methodName) as $menuItem)
     {
         if(isset($menuItem->hidden)) continue;

module/repo/model.php

@@ -977,13 +977,14 @@ class repoModel extends model
         }
         elseif($scm == 'Git')
         {
+            if(!is_dir($path))
+            {
+                dao::$errors['path'] = sprintf($this->lang->repo->error->noFile, $path);
+                return false;
+            }
+
             if(!chdir($path))
             {
-                if(!is_dir($path))
-                {
-                    dao::$errors['path'] = sprintf($this->lang->repo->error->noFile, $path);
-                    return false;
-                }
                 if(!is_executable($path))
                 {
                     dao::$errors['path'] = sprintf($this->lang->repo->error->noPriv, $path);

module/tree/control.php

@@ -164,9 +164,18 @@ class tree extends control
             $position[] = $this->lang->tree->manageTrainskill;
         }
         elseif($viewType == 'trainpost')
-        {   
-            $this->lang->set('menugroup.tree', 'train');
-            $this->lang->tree->menu = $this->lang->train->menu;
+        {
+            $postBrowseType = $this->session->postBrowseType ? $this->session->postBrowseType : 'train';
+            if($postBrowseType == 'train')
+            {
+                $this->lang->set('menugroup.tree', 'train');
+                $this->lang->tree->menu = $this->lang->train->menu;
+            }
+            else
+            {
+                $this->lang->set('menugroup.tree', 'company');
+                $this->lang->tree->menu = $this->lang->company->menu;
+            }
 
             $title      = $this->lang->tree->manageTrainpost;
             $position[] = $this->lang->tree->manageTrainpost;

module/tree/view/browse.html.php

@@ -20,7 +20,7 @@ li.tree-item-story > .tree-actions .tree-action[data-type=delete]{display:none;}
 <?php js::set('viewType', $viewType);?>
 <?php $this->app->loadLang('doc');?>
 <?php $hasBranch = (strpos('story|bug|case', $viewType) !== false and (!empty($root->type) && $root->type != 'normal')) ? true : false;?>
-<?php $name = $viewType == 'line' ? $lang->tree->line : (($viewType == 'doc' or $viewType == 'feedback') ? $lang->tree->cate : $lang->tree->name);?>
+<?php $name = $viewType == 'line' ? $lang->tree->line : (($viewType == 'doc' or $viewType == 'feedback' or $viewType == 'trainskill' or $viewType == 'trainpost') ? $lang->tree->cate : $lang->tree->name);?>
 <?php $title = ($viewType == 'line' or $viewType == 'trainskill' or $viewType == 'trainpost') ? '' : ((strpos($viewType, 'doc') !== false || strpos($viewType, 'feedback') !== false) ? $lang->doc->childType : $lang->tree->child);?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">