* Fix bug #25483.
This commit is contained in:
@@ -547,6 +547,29 @@ class programModel extends model
|
||||
$path = $program->path;
|
||||
}
|
||||
|
||||
if($queryID)
|
||||
{
|
||||
$query = $this->loadModel('search')->getQuery($queryID);
|
||||
if($query)
|
||||
{
|
||||
$this->session->set('projectQuery', $query->sql);
|
||||
$this->session->set('projectForm', $query->form);
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->session->set('projectQuery', ' 1 = 1');
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if($this->session->projectQuery == false) $this->session->set('projectQuery', ' 1 = 1');
|
||||
}
|
||||
|
||||
if(isset($this->config->setCode) and $this->config->setCode == 0)
|
||||
{
|
||||
$this->session->projectQuery = preg_replace("/`code`.*' [)] (AND|OR) \( 1 AND `/", '1 ) $1 ( 1 AND `', $this->session->projectQuery);
|
||||
}
|
||||
|
||||
$query = str_replace('`id`','t1.id', $this->session->projectQuery);
|
||||
$projectList = $this->dao->select('distinct t1.*')->from(TABLE_PROJECT)->alias('t1')
|
||||
->leftJoin(TABLE_TEAM)->alias('t2')->on('t1.id=t2.root')
|
||||
|
||||
Reference in New Issue
Block a user