From 8f6fd3919ad90b267a3aff6c7f83ff174ebd8fd4 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Sun, 9 Oct 2022 11:16:58 +0800 Subject: [PATCH] * code for task #71605. --- module/action/model.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/module/action/model.php b/module/action/model.php index db82ae616d..756e40754a 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1063,6 +1063,8 @@ class actionModel extends model $efforts = $this->dao->select('id')->from(TABLE_EFFORT)->where($condition)->fetchPairs(); $efforts = !empty($efforts) ? implode(',', $efforts) : 0; + $noMultipleExecutions = $this->dao->select('id')->from(TABLE_PROJECT)->where('multiple')->eq(0)->andWhere('type')->in('sprint,kanban')->fetchPairs('id', 'id'); + /* Get actions. */ $actions = $this->dao->select('*')->from(TABLE_ACTION) ->where('objectType')->notIN($this->config->action->ignoreObjectType4Dynamic) @@ -1087,6 +1089,7 @@ class actionModel extends model ->beginIF($projectID == 'notzero')->andWhere('project')->gt(0)->fi() ->beginIF($executionID == 'notzero')->andWhere('execution')->gt(0)->fi() ->beginIF($productID == 'all' or $projectID == 'all' or $executionID == 'all')->andWhere("IF((objectType!= 'doc' && objectType!= 'doclib'), ($condition), '1=1')")->fi() + ->beginIF($noMultipleExecutions)->andWhere("IF(`objectType` = 'execution', `objectID` NOT " . helper::dbIN($noMultipleExecutions) . ", '1=1')")->fi() ->beginIF($actionCondition)->andWhere("($actionCondition)")->fi() /* Filter out client login/logout actions. */ ->andWhere('action')->notin('disconnectxuanxuan,reconnectxuanxuan,loginxuanxuan,logoutxuanxuan')