Merge branch dev/bug-63626 of zentao/zentaopms (#9872)

This commit is contained in:
刘刚
2025-06-25 10:55:01 +08:00
committed by Gitfox
6 changed files with 26 additions and 2 deletions
+1 -1
View File
@@ -88,7 +88,7 @@ $config->action->majorList['execution'] = array('opened', 'edited');
$config->action->majorList['doc'] = array('releaseddoc');
$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,epic,requirement,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->needGetRelateField = ',branch,story,epic,requirement,productplan,release,task,build,bug,testcase,case,testtask,testreport,design,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,pivot,scene,boardspace,auditplan,auditresult,productline,chapter,doc,';
$config->action->ignoreObjectType4Dynamic = 'kanbanregion,kanbanlane,kanbancolumn';
$config->action->ignoreActions4Dynamic = 'disconnectxuanxuan,reconnectxuanxuan,loginxuanxuan,logoutxuanxuan,editmr,removemr,syncdoingbyticket,syncdoingbystory,syncdoingbyuserstory,syncdoingbyepic,syncdoingbytask,syncdoingbybug,syncdoingbytodo,syncdoingbydemand';
+6
View File
@@ -717,6 +717,12 @@ $lang->action->dynamicAction->kanbancard['archived'] = 'Archive Card';
$lang->action->dynamicAction->kanbancard['restore'] = 'Restore Card';
$lang->action->dynamicAction->kanbancard['deleted'] = 'Delete Card';
$lang->action->dynamicAction->design['created'] = 'Create Design';
$lang->action->dynamicAction->design['changed'] = 'Change Design';
$lang->action->dynamicAction->design['confirmed'] = 'Confirm Design';
$lang->action->dynamicAction->design['assigned'] = 'Assign Design';
$lang->action->dynamicAction->design['deleted'] = 'Delete Design';
$lang->action->dynamicAction->team['managedTeam'] = 'Manage Team';
$lang->action->dynamicAction->task['opened'] = 'Create Task';
+6
View File
@@ -717,6 +717,12 @@ $lang->action->dynamicAction->kanbancard['archived'] = 'Archive Card';
$lang->action->dynamicAction->kanbancard['restore'] = 'Restore Card';
$lang->action->dynamicAction->kanbancard['deleted'] = 'Delete Card';
$lang->action->dynamicAction->design['created'] = 'Create Design';
$lang->action->dynamicAction->design['changed'] = 'Change Design';
$lang->action->dynamicAction->design['confirmed'] = 'Confirm Design';
$lang->action->dynamicAction->design['assigned'] = 'Assign Design';
$lang->action->dynamicAction->design['deleted'] = 'Delete Design';
$lang->action->dynamicAction->team['managedTeam'] = 'Manage Team';
$lang->action->dynamicAction->task['opened'] = 'Create Task';
+6
View File
@@ -717,6 +717,12 @@ $lang->action->dynamicAction->kanbancard['archived'] = 'Archive Card';
$lang->action->dynamicAction->kanbancard['restore'] = 'Restore Card';
$lang->action->dynamicAction->kanbancard['deleted'] = 'Delete Card';
$lang->action->dynamicAction->design['created'] = 'Create Design';
$lang->action->dynamicAction->design['changed'] = 'Change Design';
$lang->action->dynamicAction->design['confirmed'] = 'Confirm Design';
$lang->action->dynamicAction->design['assigned'] = 'Assign Design';
$lang->action->dynamicAction->design['deleted'] = 'Delete Design';
$lang->action->dynamicAction->team['managedTeam'] = 'Manage Team';
$lang->action->dynamicAction->task['opened'] = 'Créer Tâche';
+6
View File
@@ -717,6 +717,12 @@ $lang->action->dynamicAction->kanbancard['archived'] = '归档看板卡片';
$lang->action->dynamicAction->kanbancard['restore'] = '还原看板卡片';
$lang->action->dynamicAction->kanbancard['deleted'] = '删除看板卡片';
$lang->action->dynamicAction->design['created'] = '创建设计';
$lang->action->dynamicAction->design['changed'] = '变更设计';
$lang->action->dynamicAction->design['confirmed'] = '确认设计';
$lang->action->dynamicAction->design['assigned'] = '指派设计';
$lang->action->dynamicAction->design['deleted'] = '删除设计';
$lang->action->dynamicAction->team['managedTeam'] = '维护团队';
$lang->action->dynamicAction->task['opened'] = '创建任务';
+1 -1
View File
@@ -76,7 +76,7 @@ class designModel extends model
}
$designID = $this->dao->lastInsertID();
$this->action->create('design', $designID, 'Opened');
$this->action->create('design', $designID, 'created');
}
return true;