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

Merge branch 'master' of git@github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wyd621
2013-08-19 09:24:34 +08:00
parent 123bb5d8c6 19e3ce4648
commit 70d6a157ae
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+3 -2
View File
@@ -552,7 +552,7 @@ class projectModel extends model
->andWhere('t2.deleted')->eq(0)
->andWhere('t2.iscat')->eq(0)
->beginIF($status == 'undone')->andWhere('t2.status')->ne('done')->fi()
->beginIF($status == 'isdoing')->andWhere('t2.status')->ne('done')->andWhere('status')->ne('suspended')->fi()
->beginIF($status == 'isdoing')->andWhere('t2.status')->ne('done')->andWhere('t2.status')->ne('suspended')->fi()
->beginIF($status != 'all' and $status != 'isdoing' and $status != 'undone')->andWhere('status')->in($status)->fi()
->orderBy('code')
->beginIF($limit)->limit($limit)->fi()
@@ -562,7 +562,8 @@ class projectModel extends model
{
return $this->dao->select('*, IF(INSTR(" done", status) < 2, 0, 1) AS isDone')->from(TABLE_PROJECT)->where('iscat')->eq(0)
->beginIF($status == 'undone')->andWhere('status')->ne('done')->fi()
->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi()
->beginIF($status == 'isdoing')->andWhere('status')->ne('done')->andWhere('status')->ne('suspended')->fi()
->beginIF($status != 'all' and $status != 'isdoing' and $status != 'undone')->andWhere('status')->in($status)->fi()
->andWhere('deleted')->eq(0)
->orderBy('code')
->beginIF($limit)->limit($limit)->fi()
module/tree/control.php
+8 -1
View File
@@ -303,7 +303,14 @@ class tree extends control
*/
public function ajaxGetOptionMenu($rootID, $viewType = 'story', $rootModuleID = 0, $returnType = 'html', $needManage = false)
{
$optionMenu = $this->tree->getOptionMenu($rootID, $viewType, $rootModuleID);
if($viewType = 'task')
{
$optionMenu = $this->tree->getTaskOptionMenu($rootID);
}
else
{
$optionMenu = $this->tree->getOptionMenu($rootID, $viewType, $rootModuleID);
}
if($returnType == 'html')
{
$output = html::select("module", $optionMenu, '', "onchange=loadModuleRelated()");