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

Merge branch 'zentaopms_239_task_#71598' into 'zentaopms_239'

Browse Source 
* Finish task #71598, #71599,#71600.

See merge request easycorp/zentaopms!5733
This commit is contained in:
王怡栋
2022-10-17 08:42:51 +00:00
parent 834549a7f0 0c15499b3d
commit 0843863e5d
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+3 -2
View File
@@ -1692,9 +1692,10 @@ class executionModel extends model
$executionPairs = array();
foreach($executions as $execution)
{
$executionPairs[$execution->id] = '';
if(isset($projects[$execution->project])) $executionPairs[$execution->id] .= $projects[$execution->project] . ' / ';
$executionPairs[$execution->id] = '';
$executionPairs[$execution->id] .= isset($projects[$execution->project]) ? ($projects[$execution->project] . ' / ') : '';
$executionPairs[$execution->id] .= $execution->name;
if(empty($execution->multiple)) $executionPairs[$execution->id] = $projects[$execution->project] . "({$this->lang->project->disableExecution})";
}
$executions = $executionPairs;
module/project/model.php
+7 -5
View File
@@ -844,18 +844,20 @@ class projectModel extends model
* Get project pairs by id list.
*
* @param array $projectIdList
* @param string $mode
* @param string $model
* @param string $param
* @access public
* @return array
*/
public function getPairsByIdList($projectIdList = array(), $mode = '')
public function getPairsByIdList($projectIdList = array(), $model = '', $param = '')
{
return $this->dao->select('id, name')->from(TABLE_PROJECT)
->where('type')->eq('project')
->andWhere('deleted')->eq(0)
->beginIF($projectIdList)->andWhere('id')->in($projectIdList)->fi()
->beginIF(!$this->app->user->admin and $mode != 'all')->andWhere('id')->in($this->app->user->view->projects)->fi()
->beginIF($mode != 'all' and !empty($mode))->andWhere('model')->in($mode)->fi()
->beginIF(!$this->app->user->admin and $model != 'all')->andWhere('id')->in($this->app->user->view->projects)->fi()
->beginIF($model != 'all' and !empty($model))->andWhere('model')->in($model)->fi()
->beginIF(strpos($param, 'multiple') !== false)->andWhere('multiple')->eq('1')->fi()
->fetchPairs('id', 'name');
}
@@ -1030,7 +1032,7 @@ class projectModel extends model
->beginIF($this->config->vision)->andWhere('vision')->eq($this->config->vision)->fi()
->beginIF($model != 'all')->andWhere('model')->eq($model)->fi()
->beginIF(strpos($param, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
->beginIF(strpos($param, 'nomultiple') !== false)->andWhere('multiple')->eq('1')->fi()
->beginIF(strpos($param, 'multiple') !== false)->andWhere('multiple')->eq('1')->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->beginIF(!empty($append))->orWhere('id')->in($append)->fi()
->orderBy($orderBy)