* fix bug for search in build.

This commit is contained in:
z
2020-11-29 17:21:01 +08:00
parent fabd02ef52
commit c649903b8c
2 changed files with 14 additions and 4 deletions
+13 -3
View File
@@ -84,15 +84,25 @@ class buildModel extends model
public function getProjectBuildsBySearch($projectID, $queryID)
{
/* If there are saved query conditions, reset the session. */
if($queryID)
if((int)$queryID)
{
$query = $this->loadModel('search')->getQuery($queryID);
if($query)
$buildQuery = $this->loadModel('search')->getQuery($queryID);
if($buildQuery)
{
$this->session->set('projectBuildQuery', $query->sql);
$this->session->set('projectBuildForm', $query->form);
}
else
{
$this->session->set('projectBuildQuery', ' 1 = 1');
}
}
else
{
if($this->session->projectBuildQuery == false) $this->session->set('projectBuildQuery', ' 1 = 1');
}
$buildQuery = $this->session->projectBuildQuery;
/* Distinguish between repeated fields. */
$fields = array('id' => '`id`', 'name' => '`name`', 'product' => '`product`', 'desc' => '`desc`');
+1 -1
View File
@@ -885,7 +885,7 @@ class project extends control
/* Get builds. */
if($type == 'bysearch')
{
$builds = $this->loadModel('build')->getProjectBuildsBySearch((int)$projectID, $param);
$builds = $this->loadModel('build')->getProjectBuildsBySearch((int)$projectID, (int)$param);
}
else
{