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

Merge branch 'sprint/235_tianshujie_26758' into 'sprint/235'

Browse Source 
* Fix bug #26758,  #25942., #23957.

See merge request easycorp/zentaopms!5176
This commit is contained in:
孙广明
2022-08-29 06:53:31 +00:00
parent 508e251f76 0d4b77197f
commit 1e1ddeb0b0
6 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/program/css/create.css
View File

@@ -1,5 +1,7 @@
#budget {border-right: 0px;}
#budget:focus {border-right: 1px solid #0c64eb;}
#budgetUnit {border-left: 0px;}
#budgetUnit:focus {border-left: 1px solid #0c64eb;}
#dateRange, .futureBox {vertical-align: top !important; padding-top: 13px !important;}
#endList {vertical-align: top; padding-top: 13px;}
[lang^=en] #endList {vertical-align: top; padding-top: 20px;}

2
module/program/model.php
View File

@@ -575,7 +575,7 @@ class programModel extends model
->beginIF($this->config->systemMode == 'new')->andWhere('t1.type')->eq('project')->fi()
->beginIF($this->config->systemMode == 'new' and ($this->cookie->involved or $involved))->andWhere('t2.type')->eq('project')->fi()
->beginIF(!in_array($browseType, array('all', 'undone', 'bysearch', 'review', 'unclosed'), true))->andWhere('t1.status')->eq($browseType)->fi()
->beginIF($browseType == 'undone' or $browseType = 'unclosed')->andWhere('t1.status')->in('wait,doing')->fi()
->beginIF($browseType == 'undone' or $browseType == 'unclosed')->andWhere('t1.status')->in('wait,doing')->fi()
->beginIF($browseType == 'review')
->andWhere("FIND_IN_SET('{$this->app->user->account}', t1.reviewers)")
->andWhere('t1.reviewStatus')->eq('doing')