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

Merge branch dev/bug-62931 of zentao/zentaopms (#9026)

Browse Source
This commit is contained in:
刘刚
2025-05-29 15:49:21 +08:00
committed by Gitfox
parent 5364cd6b00 3081ab9ca9
commit 978cacda2f
8 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+6 -6
View File
@@ -151,6 +151,7 @@ class executionModel extends model
/* 模板执行不显示1.5级导航。 */
$this->config->hasDropmenuApps = array_diff($this->config->hasDropmenuApps, array('project', 'execution'));
$this->lang->switcherMenu = '';
unset($this->lang->execution->menu->kanban);
unset($this->lang->execution->menu->burn);
@@ -240,9 +241,9 @@ class executionModel extends model
}
/* 项目模板不校验访问权限。 */
$isTpl = $this->dao->select('isTpl')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('isTpl');
$isTpl = $this->dao->select('isTpl')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->andWhere('id')->in($this->app->user->view->sprints)->fetch('isTpl');
/* If the execution doesn't exist in the list, use the first execution in the list. */
if(!$isTpl && !isset($executions[$executionID]))
if(empty($isTpl) && !isset($executions[$executionID]))
{
/* Check execution. */
if($executionID)
@@ -1483,7 +1484,7 @@ class executionModel extends model
{
/* Construct the query SQL at search executions. */
$executionQuery = $browseType == 'bySearch' ? $this->getExecutionQuery($param) : '';
if($projectID) $project = $this->dao->select('model,isTpl')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch();
$projectModel = $this->dao->select('model')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch('model');
return $this->dao->select('t1.*,t2.name projectName, t2.model as projectModel')->from(TABLE_EXECUTION)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
@@ -1492,9 +1493,8 @@ class executionModel extends model
->andWhere('t1.deleted')->eq('0')
->andWhere('t1.vision')->eq($this->config->vision)
->andWhere('t1.multiple')->eq('1')
->beginIF(!empty($project->isTpl))->andWhere('t1.isTpl')->eq('1')->fi()
->beginIF(!empty($project->model) && $project->model == 'ipd')->andWhere('t1.enabled')->eq('on')->fi()
->beginIF(!$this->app->user->admin && empty($project->isTpl))->andWhere('t1.id')->in($this->app->user->view->sprints)->fi()
->beginIF($projectModel == 'ipd')->andWhere('t1.enabled')->eq('on')->fi()
->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->sprints)->fi()
->beginIF(!empty($executionQuery))->andWhere($executionQuery)->fi()
->beginIF($productID)->andWhere('t3.product')->eq($productID)->fi()
->beginIF($projectID)->andWhere('t1.project')->eq($projectID)->fi()