diff --git a/module/program/model.php b/module/program/model.php index 93c3935060..12e5614b57 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -565,11 +565,6 @@ class programModel extends model 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') diff --git a/module/project/config.php b/module/project/config.php index 2e7a9498b8..c90e9b5f05 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -155,7 +155,7 @@ $config->project->search['fields']['lastEditedDate'] = $lang->project->lastEdite $config->project->search['fields']['closedDate'] = $lang->project->closedDate; $config->project->search['params']['name'] = array('operator' => 'include', 'control' => 'input' , 'values' => ''); -if(!isset($config->setCode) or $config->setCode == 1) $config->project->search['params']['code'] = array('operator' => '=' , 'control' => 'input' , 'values' => ''); +if(!isset($config->setCode) or $config->setCode == 1) $config->project->search['params']['code'] = array('operator' => '=', 'control' => 'input' , 'values' => ''); $config->project->search['params']['id'] = array('operator' => '=' , 'control' => 'input' , 'values' => ''); $config->project->search['params']['model'] = array('operator' => '=' , 'control' => 'select', 'values' => $lang->project->modelList); $config->project->search['params']['parent'] = array('operator' => '=' , 'control' => 'select', 'values' => '');