Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task#7481.

Browse Source
This commit is contained in:
leiyong
2020-07-19 18:14:00 -07:00
parent 5819bb69b8
commit 2dbbe8ab36
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+2 -2
View File
@@ -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
+2
View File
@@ -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
-1
View File
@@ -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
+1 -1
View File
@@ -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
+1
View File
@@ -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;