diff --git a/config/zentaopms.php b/config/zentaopms.php index 1b94bfc23c..9f0f6e84b9 100644 --- a/config/zentaopms.php +++ b/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] = '产品'; diff --git a/module/bug/control.php b/module/bug/control.php index a27b5ff705..1b6a95e3a6 100644 --- a/module/bug/control.php +++ b/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); diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index b72575dc16..a031ae8fe9 100644 --- a/module/bug/view/browse.html.php +++ b/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 = "{$menuItem->text}"; + if($this->session->bugBrowseType == 'bysearch') $browseType = 'all'; + if($this->session->bugBrowseType != 'bysearch' && $browseType == 'bymodule') $browseType = $this->session->bugBrowseType; $label .= $menuBrowseType == $browseType ? " {$pager->recTotal}" : ''; $active = $menuBrowseType == $browseType ? 'btn-active-text' : ''; diff --git a/module/ci/model.php b/module/ci/model.php index 444404042d..deb4fc23ed 100644 --- a/module/ci/model.php +++ b/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; diff --git a/module/compile/model.php b/module/compile/model.php index 0a074e556f..717ea6fd76 100644 --- a/module/compile/model.php +++ b/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); diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index ad8a559987..61b8e605d5 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -39,6 +39,7 @@ js::set('foldAll', $lang->project->treeLevel['root']);
session->storyBrowseType == 'bysearch') $this->session->set('storyBrowseType', 'allstory'); foreach(customModel::getFeatureMenu($this->moduleName, $this->methodName) as $menuItem) { if(isset($menuItem->hidden)) continue; diff --git a/module/repo/model.php b/module/repo/model.php index c6c37ce568..72400ab578 100644 --- a/module/repo/model.php +++ b/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); diff --git a/module/tree/control.php b/module/tree/control.php index fa76911d65..3a7a16d428 100644 --- a/module/tree/control.php +++ b/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; diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index 56ef2bf98d..907a415c30 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -20,7 +20,7 @@ li.tree-item-story > .tree-actions .tree-action[data-type=delete]{display:none;} app->loadLang('doc');?> type) && $root->type != 'normal')) ? true : false;?> -tree->line : (($viewType == 'doc' or $viewType == 'feedback') ? $lang->tree->cate : $lang->tree->name);?> +tree->line : (($viewType == 'doc' or $viewType == 'feedback' or $viewType == 'trainskill' or $viewType == 'trainpost') ? $lang->tree->cate : $lang->tree->name);?> doc->childType : $lang->tree->child);?>