Merge branch 'sprint/174_tianshujie_16897' into 'master'
* Fix bug #16897. See merge request easycorp/zentaopms!725
This commit is contained in:
@@ -570,7 +570,7 @@ class bugModel extends model
|
||||
->andWhere('t1.deleted')->eq(0)
|
||||
->orderBy('id desc')
|
||||
->page($pager)
|
||||
->fetchAll();
|
||||
->fetchAll('id');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -603,7 +603,7 @@ class execution extends control
|
||||
if($this->session->importBugQuery == false) $this->session->set('importBugQuery', ' 1 = 1');
|
||||
}
|
||||
$bugQuery = str_replace("`product` = 'all'", "`product`" . helper::dbIN(array_keys($products)), $this->session->importBugQuery); // Search all execution.
|
||||
$bugs = $this->execution->getSearchBugs($products, $executionID, $bugQuery, $pager, 'id_desc');
|
||||
$bugs = $this->execution->getSearchBugs($products, $executionID, $bugQuery, $pager, 'id_desc');
|
||||
}
|
||||
|
||||
/* Build the search form. */
|
||||
@@ -656,8 +656,8 @@ class execution extends control
|
||||
$this->view->browseType = $browseType;
|
||||
$this->view->param = $param;
|
||||
$this->view->users = $users;
|
||||
$this->view->execution = $this->execution->getByID($executionID);
|
||||
$this->view->executionID = $executionID;
|
||||
$this->view->execution = $this->execution->getByID($executionID);
|
||||
$this->view->executionID = $executionID;
|
||||
$this->view->requiredFields = explode(',', $this->config->task->create->requiredFields);
|
||||
$this->display();
|
||||
}
|
||||
|
||||
@@ -2962,7 +2962,7 @@ class executionModel extends model
|
||||
->andWhere('deleted')->eq(0)
|
||||
->orderBy($orderBy)
|
||||
->page($pager)
|
||||
->fetchAll();
|
||||
->fetchAll('id');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user