* code for task #6239.

This commit is contained in:
wangyidong
2019-08-22 13:46:32 +08:00
parent 6b9b77fd4e
commit 296d9ebc11
2 changed files with 8 additions and 4 deletions
+2
View File
@@ -84,3 +84,5 @@ td.c-name a:visited{color: #082999}
#createDropdown ul.dropdown-menu{width:100%;}
.color-darkblue{background:rgb(0,0,139)}
.color-darkblue:hover{background:rgb(0,0,139)}
.color-darkblue:focus{background:rgb(0,0,139)}
+6 -4
View File
@@ -147,13 +147,15 @@ class docModel extends model
}
elseif($type == 'all')
{
/* Show all undeleted doclibs,if display settings selected shows only unclosed projects then shows only unclosed projects doclibs. */
$undoneSql = $this->dao->select('id')->from(TABLE_PROJECT)->where('deleted')->eq(0)->andWhere('status')->notin('done,closed')->get();
$stmt = $this->dao->select('*')->from(TABLE_DOCLIB)
/* If extra have unclosedProject then ignore unclosed project libs. */
$unclosedProjects = array();
if(strpos($extra, 'unclosedProject') !== false) $unclosedProjects = $this->dao->select('id')->from(TABLE_PROJECT)->where('deleted')->eq(0)->andWhere('status')->notin('done,closed')->fetchPairs('id', 'id');
$stmt = $this->dao->select('*')->from(TABLE_DOCLIB)
->where('deleted')->eq(0)
->beginIF(strpos($extra, 'unclosedProject') !== false)
->andWhere('project', true)->eq('0')
->orWhere("project IN ($undoneSql)")
->orWhere('project')->in($unclosedProjects)
->markRight(1)
->fi()
->orderBy('`order`,id desc')