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

Merge branch 'sprint/185' into 'sprint/185_zhangzilong_49284'

Browse Source 
# Conflicts:
#   db/update16.4.sql
This commit is contained in:
孙广明
2022-02-18 06:23:22 +00:00
parent e56df2bc34 60937d3a52
commit ffbbfe417f
74 changed files with 1098 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+4 -4
View File
@@ -999,7 +999,7 @@ class bug extends control
$this->view->branchTagOption = $branchTagOption;
$this->view->tasks = $this->task->getExecutionTaskPairs($bug->execution);
$this->view->testtasks = $this->loadModel('testtask')->getPairs($bug->product, $bug->execution, $bug->testtask);
$this->view->users = $this->user->getPairs('noclosed', "$bug->assignedTo,$bug->resolvedBy,$bug->closedBy,$bug->openedBy");
$this->view->users = $this->user->getPairs('', "$bug->assignedTo,$bug->resolvedBy,$bug->closedBy,$bug->openedBy");
$this->view->openedBuilds = $openedBuilds;
$this->view->resolvedBuilds = array('' => '') + $openedBuilds + $oldResolvedBuild;
$this->view->actions = $this->action->getList('bug', $bugID);
@@ -1135,7 +1135,7 @@ class bug extends control
$appendUsers[$bug->assignedTo] = $bug->assignedTo;
$appendUsers[$bug->resolvedBy] = $bug->resolvedBy;
}
$users = $this->user->getPairs('devfirst|noclosed', $appendUsers, $this->config->maxCount);
$users = $this->user->getPairs('devfirst', $appendUsers, $this->config->maxCount);
$users = array('' => '', 'ditto' => $this->lang->bug->ditto) + $users;
/* Assign. */
@@ -1709,8 +1709,8 @@ class bug extends control
$this->view->pager = $pager;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->recTotal = $recTotal;
$this->view->recPerPage = $recPerPage;
$this->view->pageID = $pageID;
$this->view->recPerPage = $recPerPage;
$this->view->pageID = $pageID;
$this->display();
}
module/bug/model.php
+2 -1
View File
@@ -1357,10 +1357,11 @@ class bugModel extends model
* @param int $bugID
* @param string $browseType
* @param int $queryID
* @param object $pager
* @access public
* @return array
*/
public function getBugs2Link($bugID, $browseType = 'bySearch', $queryID = 0, $pager)
public function getBugs2Link($bugID, $browseType = 'bySearch', $queryID = 0, $pager = null)
{
if($browseType == 'bySearch')
{