Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master_xieqiyu_23185' into 'master'

Browse Source 
* Fix bug#23185.

See merge request easycorp/zentaopms!3707
This commit is contained in:
王怡栋
2022-06-02 03:10:24 +00:00
parent c470517b65 1a24cdbc80
commit 10ca474547
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/control.php
+3 -3
View File
@@ -52,9 +52,9 @@ class program extends control
}
else
{
/* Get pager for top program and projects whithout program. */
$this->program->getList($status, $orderBy, $pager, 'top');
$programs = $this->program->getList($status, $orderBy);
/* Get top programs and projects. */
$topObjects = $this->program->getList($status, $orderBy, $pager, 'top');
$programs = $this->program->getList($status, $orderBy, NULL, 'child', array_keys($topObjects));
/* Get summary. */
$topCount = $indCount = 0;
module/program/model.php
+14 -3
View File
@@ -131,12 +131,12 @@ class programModel extends model
* @param string $orderBy
* @param object $pager
* @param string $type top|child
* @param array $topIdList
* @access public
* @return array
*/
public function getList($status = 'all', $orderBy = 'id_asc', $pager = NULL, $type = '')
public function getList($status = 'all', $orderBy = 'id_asc', $pager = NULL, $type = '', $topIdList = '')
{
$objectIdList = array();
if(!$this->app->user->admin)
{
$objectIdList = trim($this->app->user->view->programs, ',') . ',' . trim($this->app->user->view->projects, ',');
@@ -145,9 +145,20 @@ class programModel extends model
if($this->app->rawMethod == 'browse')
{
$pathList = $this->dao->select('id,path')->from(TABLE_PROJECT)->where('id')->in($objectIdList)->andWhere('deleted')->eq(0)->fetchPairs('id');
$pathList = $this->dao->select('id,path')->from(TABLE_PROJECT)
->where('id')->in($objectIdList)
->andWhere('deleted')->eq(0)
->fetchPairs('id');
$objectIdList = array();
foreach($pathList as $path)
{
if($type == 'child' and !empty($topIdList))
{
$topID = $this->getTopByPath($path);
if(!in_array($topID, $topIdList)) continue;
}
foreach(explode(',', trim($path, ',')) as $pathID) $objectIdList[$pathID] = $pathID;
}
}