diff --git a/module/action/config.php b/module/action/config.php index 1170e5770a..68e5dfd959 100755 --- a/module/action/config.php +++ b/module/action/config.php @@ -78,7 +78,8 @@ $config->action->majorList['doc'] = array('releaseddoc', 'collected'); $config->action->needGetProjectType = 'build,task,bug,case,testcase,caselib,testtask,testsuite,testreport,doc,issue,release,risk,design,opportunity,trainplan,gapanalysis,researchplan,researchreport,'; $config->action->needGetRelateField = ',branch,story,productplan,release,task,build,bug,testcase,case,testtask,testreport,doc,doclib,issue,risk,opportunity,trainplan,gapanalysis,team,whitelist,researchplan,researchreport,meeting,kanbanlane,kanbancolumn,module,review,'; $config->action->noLinkModules = ',doclib,module,webhook,gitlab,instance,gitea,gogs,sonarqube,pipeline,jenkins,kanban,kanbanspace,kanbancolumn,kanbanlane,kanbanregion,kanbancard,execution,project,traincategory,apistruct,program,product,user,entry,repo,'; -$config->action->ignoreObjectType4Dynamic = 'kanbanregion,kanbanlane,kanbancolumn,disconnectxuanxuan,reconnectxuanxuan,loginxuanxuan,logoutxuanxuan,editmr,removemr'; +$config->action->ignoreObjectType4Dynamic = 'kanbanregion,kanbanlane,kanbancolumn'; +$config->action->ignoreActions4Dynamic = 'disconnectxuanxuan,reconnectxuanxuan,loginxuanxuan,logoutxuanxuan,editmr,removemr'; $config->action->preferredTypeNum = 10; diff --git a/module/action/model.php b/module/action/model.php index 30f71f630b..8b36fe0e92 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1440,6 +1440,7 @@ class actionModel extends model $actions = $this->dao->select('*')->from($actionTable) ->where('objectType')->notIN($this->config->action->ignoreObjectType4Dynamic) + ->andWhere('action')->notIN($this->config->action->ignoreActions4Dynamic) ->beginIF($this->config->vision == 'lite')->andWhere('objectType')->notin('product')->fi() ->beginIF($this->config->systemMode == 'light')->andWhere('objectType')->notin('program')->fi() ->andWhere('vision')->eq($this->config->vision)