diff --git a/module/api/model.php b/module/api/model.php index fcff050453..cc05f51778 100644 --- a/module/api/model.php +++ b/module/api/model.php @@ -938,7 +938,7 @@ class apiModel extends model * * @param string $libID * @param int $queryID - * @param int $objectType product|project + * @param string $objectType product|project * @param array $libs * @access public * @return array @@ -947,35 +947,35 @@ class apiModel extends model { $queryName = $objectType ? $objectType . 'apiDocQuery' : 'apiQuery'; $queryForm = $objectType ? $objectType . 'apiDocForm' : 'apiForm'; - if($queryID) - { - $query = $this->loadModel('search')->getQuery($queryID); - if($query) - { - $this->session->set($queryName, $query->sql); - $this->session->set($queryForm, $query->form); - } - else - { - $this->session->set($queryName, ' 1 = 1'); - } - } - else - { - if($this->session->$queryName == false) $this->session->set($queryName, ' 1 = 1'); - } + if($queryID) + { + $query = $this->loadModel('search')->getQuery($queryID); + if($query) + { + $this->session->set($queryName, $query->sql); + $this->session->set($queryForm, $query->form); + } + else + { + $this->session->set($queryName, ' 1 = 1'); + } + } + else + { + if($this->session->$queryName == false) $this->session->set($queryName, ' 1 = 1'); + } - $apiQuery = $this->session->$queryName; - if(strpos($apiQuery, "`lib` = 'all'") === false and !$objectType) $apiQuery = "$apiQuery and lib = $libID"; - if(strpos($apiQuery, "`lib` = 'all'") !== false) $apiQuery = str_replace("`lib` = 'all'", '1', $apiQuery); + $apiQuery = $this->session->$queryName; + if(strpos($apiQuery, "`lib` = 'all'") === false and !$objectType) $apiQuery = "$apiQuery and lib = $libID"; + if(strpos($apiQuery, "`lib` = 'all'") !== false) $apiQuery = str_replace("`lib` = 'all'", '1', $apiQuery); - $list = $this->dao->select('*') - ->from(TABLE_API) - ->where('deleted')->eq(0) - ->andWhere($apiQuery) - ->beginIF(!empty($libs))->andWhere('`lib`')->in($libs)->fi() - ->fetchAll(); + $list = $this->dao->select('*') + ->from(TABLE_API) + ->where('deleted')->eq(0) + ->andWhere($apiQuery) + ->beginIF(!empty($libs))->andWhere('`lib`')->in($libs)->fi() + ->fetchAll(); - return $list; + return $list; } } diff --git a/module/doc/control.php b/module/doc/control.php index a0784016c7..02e0c29bf4 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -355,7 +355,6 @@ class doc extends control } elseif($this->app->tab == 'project') { - $linkType = 'project'; $this->project->setMenu($this->session->project); } elseif($this->app->tab == 'execution') @@ -1243,7 +1242,9 @@ class doc extends control * @param string $type * @param int $objectID * @param int $libID + * @param int $moduleID * @param string $browseType + * @param string $orderBy * @param int $param * @param int $recTotal * @param int $recPerPage diff --git a/module/doc/model.php b/module/doc/model.php index 0663415d4c..5b73c6b3de 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -2715,7 +2715,6 @@ class docModel extends model */ public function getDocsBySearch($type, $objectID, $libID, $queryID, $orderBy = 'id_desc', $pager = null) { - $lib = $this->getLibById($libID); $queryName = $type . 'libDocQuery'; $queryForm = $type . 'libDocForm'; if($queryID)