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

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

Browse Source
This commit is contained in:
xia0ta0
2014-12-09 15:23:28 +08:00
parent 08995fda1d 64ab8de121
commit 9431e4792e
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+1 -1
View File
@@ -140,7 +140,7 @@ class bug extends control
$bug->resolvedBuild = isset($builds[$bug->resolvedBuild]) ? $builds[$bug->resolvedBuild] : $bug->resolvedBuild;
}
$memberPairs = $this->user->getPairs('noletter');
$memberPairs = $this->user->getPairs('noletter|nodeleted');
$title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->common;
$position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
module/common/model.php
+2
View File
@@ -646,6 +646,7 @@ class commonModel extends model
$preAndNextObject = new stdClass();
if(strpos('story, task, bug, testcase, doc', $type) === false) return $preAndNextObject;
if($this->session->{$type . 'PreAndNext'} and $this->session->{$type . 'PreAndNext'}['objectID'] == $objectID) return $this->session->{$type . 'PreAndNext'}['preAndNextObject'];
$table = $this->config->objectTables[$type];
/* Get objectIDs. */
@@ -692,6 +693,7 @@ class commonModel extends model
if($preObj !== true) $preObj = $object;
}
$this->session->set($type . 'PreAndNext', array('objectID' => $objectID, 'preAndNextObject' => $preAndNextObject));
return $preAndNextObject;
}