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

Merge branch 'cyy_25032' into 'master'

Browse Source 
* Fix bug #25032.

See merge request easycorp/zentaopms!4436
This commit is contained in:
李玉春
2022-07-08 06:23:43 +00:00
parent 30401195fa 8267cfaa94
commit be3823aa09
8 changed files with 106 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/zentaopms.php
+2 -1
View File
@@ -372,6 +372,7 @@ $config->objectTables['kanbanorder'] = TABLE_KANBANORDER;
$config->objectTables['kanbangroup'] = TABLE_KANBANGROUP;
$config->objectTables['kanbancard'] = TABLE_KANBANCARD;
$config->objectTables['sonarqube'] = TABLE_PIPELINE;
$config->objectTables['gitea'] = TABLE_PIPELINE;
$config->objectTables['gitlab'] = TABLE_PIPELINE;
$config->objectTables['jebkins'] = TABLE_PIPELINE;
$config->objectTables['stage'] = TABLE_STAGE;
@@ -379,7 +380,7 @@ $config->objectTables['apistruct'] = TABLE_APISTRUCT;
$config->newFeatures = array('introduction', 'tutorial', 'youngBlueTheme', 'visions');
$config->pipelineTypeList = array('gitlab', 'sonarqube', 'jenkins');
$config->pipelineTypeList = array('gitlab', 'sonarqube', 'jenkins', 'gitea');
/* Program privs.*/
$config->programPriv = new stdclass();
module/action/config.php
+2 -1
View File
@@ -43,6 +43,7 @@ $config->action->objectNameFields['kanban'] = 'name';
$config->action->objectNameFields['kanbancard'] = 'name';
$config->action->objectNameFields['sonarqube'] = 'name';
$config->action->objectNameFields['gitlab'] = 'name';
$config->action->objectNameFields['gitea'] = 'name';
$config->action->objectNameFields['stage'] = 'name';
$config->action->objectNameFields['apistruct'] = 'name';
@@ -60,7 +61,7 @@ $config->action->majorList['execution'] = array('opened', 'edited');
$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 = ',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,';
$config->action->noLinkModules = ',doclib,module,webhook,gitlab,sonarqube,pipeline,jenkins,kanban,kanbanspace,kanbancolumn,kanbanlane,kanbanregion,kanbancard,execution,project,traincategory,apistruct,program,product,user,entry,';
$config->action->noLinkModules = ',doclib,module,webhook,gitlab,gitea,sonarqube,pipeline,jenkins,kanban,kanbanspace,kanbancolumn,kanbanlane,kanbanregion,kanbancard,execution,project,traincategory,apistruct,program,product,user,entry,';
$config->action->preferredTypeNum = 10;
module/action/lang/de.php
+5
View File
@@ -123,6 +123,7 @@ $lang->action->objectTypes['team'] = 'Team';
$lang->action->objectTypes['whitelist'] = 'Whitelist';
$lang->action->objectTypes['pipeline'] = 'GitLib';
$lang->action->objectTypes['gitlab'] = 'GitLab Server';
$lang->action->objectTypes['gitea'] = 'Gitea Server';
$lang->action->objectTypes['jenkins'] = 'Jenkins';
$lang->action->objectTypes['mr'] = 'Merge Request';
$lang->action->objectTypes['gitlabproject'] = 'GitLab Project';
@@ -635,6 +636,10 @@ $lang->action->dynamicAction->gitlab['created'] = 'Create GitLab Server';
$lang->action->dynamicAction->gitlab['edited'] = 'Edit GitLab Server';
$lang->action->dynamicAction->gitlab['deleted'] = 'Delete GitLab Server';
$lang->action->dynamicAction->gitea['created'] = 'Create Gitea Server';
$lang->action->dynamicAction->gitea['edited'] = 'Edit Gitea Server';
$lang->action->dynamicAction->gitea['deleted'] = 'Delete Gitea Server';
/* Generate the corresponding object link. */
$lang->action->label->product = $lang->productCommon . '|product|view|productID=%s';
$lang->action->label->productplan = 'Plan|productplan|view|productID=%s';
module/action/lang/en.php
+5
View File
@@ -123,6 +123,7 @@ $lang->action->objectTypes['team'] = 'Team';
$lang->action->objectTypes['whitelist'] = 'Whitelist';
$lang->action->objectTypes['pipeline'] = 'GitLab Server';
$lang->action->objectTypes['gitlab'] = 'GitLab Server';
$lang->action->objectTypes['gitea'] = 'Gitea Server';
$lang->action->objectTypes['jenkins'] = 'Jenkins';
$lang->action->objectTypes['mr'] = 'Merge Request';
$lang->action->objectTypes['gitlabproject'] = 'GitLab Project';
@@ -635,6 +636,10 @@ $lang->action->dynamicAction->gitlab['created'] = 'Create GitLab Server';
$lang->action->dynamicAction->gitlab['edited'] = 'Edit GitLab Server';
$lang->action->dynamicAction->gitlab['deleted'] = 'Delete GitLab Server';
$lang->action->dynamicAction->gitea['created'] = 'Create Gitea Server';
$lang->action->dynamicAction->gitea['edited'] = 'Edit Gitea Server';
$lang->action->dynamicAction->gitea['deleted'] = 'Delete Gitea Server';
/* Generate the corresponding object link. */
$lang->action->label->product = $lang->productCommon . '|product|view|productID=%s';
$lang->action->label->productplan = 'Plan|productplan|view|productID=%s';
module/action/lang/fr.php
+5
View File
@@ -123,6 +123,7 @@ $lang->action->objectTypes['team'] = 'Team';
$lang->action->objectTypes['whitelist'] = 'Whitelist';
$lang->action->objectTypes['pipeline'] = 'GitLib';
$lang->action->objectTypes['gitlab'] = 'GitLab Server';
$lang->action->objectTypes['gitea'] = 'Gitea Server';
$lang->action->objectTypes['jenkins'] = 'Jenkins';
$lang->action->objectTypes['mr'] = 'Merge Request';
$lang->action->objectTypes['gitlabproject'] = 'GitLab Project';
@@ -635,6 +636,10 @@ $lang->action->dynamicAction->gitlab['created'] = 'Create GitLab Server';
$lang->action->dynamicAction->gitlab['edited'] = 'Edit GitLab Server';
$lang->action->dynamicAction->gitlab['deleted'] = 'Delete GitLab Server';
$lang->action->dynamicAction->gitea['created'] = 'Create Gitea Server';
$lang->action->dynamicAction->gitea['edited'] = 'Edit Gitea Server';
$lang->action->dynamicAction->gitea['deleted'] = 'Delete Gitea Server';
/* Generate the corresponding object link. */
$lang->action->label->product = $lang->productCommon . '|product|view|productID=%s';
$lang->action->label->productplan = 'Plan|productplan|view|productID=%s';
module/action/lang/vi.php
+76 -35
View File
@@ -65,41 +65,62 @@ $lang->action->periods['lastweek'] = $lang->action->dynamic->lastWeek;
$lang->action->periods['thismonth'] = $lang->action->dynamic->thisMonth;
$lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth;
$lang->action->objectTypes['product'] = $lang->productCommon;
$lang->action->objectTypes['branch'] = 'Nhánh';
$lang->action->objectTypes['story'] = $lang->SRCommon;
$lang->action->objectTypes['design'] = 'Design';
$lang->action->objectTypes['productplan'] = 'Plan';
$lang->action->objectTypes['release'] = 'Phát hành';
$lang->action->objectTypes['program'] = 'Program';
$lang->action->objectTypes['project'] = 'Project';
$lang->action->objectTypes['execution'] = $lang->executionCommon;
$lang->action->objectTypes['task'] = 'Nhiệm vụ';
$lang->action->objectTypes['build'] = 'Bản dựng';
$lang->action->objectTypes['job'] = 'Job';
$lang->action->objectTypes['bug'] = 'Bug';
$lang->action->objectTypes['case'] = 'Tình huống';
$lang->action->objectTypes['caseresult'] = 'Kết quả tình huống';
$lang->action->objectTypes['stepresult'] = 'Các bước tình huống';
$lang->action->objectTypes['caselib'] = 'Thư viện';
$lang->action->objectTypes['testsuite'] = 'Suite';
$lang->action->objectTypes['testtask'] = 'Test bản dựng';
$lang->action->objectTypes['testreport'] = 'Báo cáo';
$lang->action->objectTypes['doc'] = 'Tài liệu';
$lang->action->objectTypes['doclib'] = 'Thư viện tài liệu';
$lang->action->objectTypes['todo'] = 'Việc làm';
$lang->action->objectTypes['risk'] = 'Risk';
$lang->action->objectTypes['issue'] = 'Issue';
$lang->action->objectTypes['module'] = 'Module';
$lang->action->objectTypes['user'] = 'Người dùng';
$lang->action->objectTypes['stakeholder'] = 'Stakeholder';
$lang->action->objectTypes['budget'] = 'Cost Estimate';
$lang->action->objectTypes['entry'] = 'Entry';
$lang->action->objectTypes['webhook'] = 'Webhook';
$lang->action->objectTypes['job'] = 'Job';
$lang->action->objectTypes['team'] = 'Team';
$lang->action->objectTypes['whitelist'] = 'Whitelist';
$lang->action->objectTypes['pipeline'] = 'GitLib';
$lang->action->objectTypes['product'] = $lang->productCommon;
$lang->action->objectTypes['branch'] = 'Nhánh';
$lang->action->objectTypes['story'] = $lang->SRCommon;
$lang->action->objectTypes['design'] = 'Design';
$lang->action->objectTypes['productplan'] = 'Plan';
$lang->action->objectTypes['release'] = 'Phát hành';
$lang->action->objectTypes['program'] = 'Program';
$lang->action->objectTypes['project'] = 'Project';
$lang->action->objectTypes['execution'] = $lang->executionCommon;
$lang->action->objectTypes['task'] = 'Nhiệm vụ';
$lang->action->objectTypes['build'] = 'Bản dựng';
$lang->action->objectTypes['job'] = 'Job';
$lang->action->objectTypes['bug'] = 'Bug';
$lang->action->objectTypes['case'] = 'Tình huống';
$lang->action->objectTypes['caseresult'] = 'Kết quả tình huống';
$lang->action->objectTypes['stepresult'] = 'Các bước tình huống';
$lang->action->objectTypes['caselib'] = 'Thư viện';
$lang->action->objectTypes['testsuite'] = 'Suite';
$lang->action->objectTypes['testtask'] = 'Test bản dựng';
$lang->action->objectTypes['testreport'] = 'Báo cáo';
$lang->action->objectTypes['doc'] = 'Tài liệu';
$lang->action->objectTypes['doclib'] = 'Thư viện tài liệu';
$lang->action->objectTypes['todo'] = 'Việc làm';
$lang->action->objectTypes['risk'] = 'Risk';
$lang->action->objectTypes['issue'] = 'Issue';
$lang->action->objectTypes['module'] = 'Module';
$lang->action->objectTypes['user'] = 'Người dùng';
$lang->action->objectTypes['stakeholder'] = 'Stakeholder';
$lang->action->objectTypes['budget'] = 'Cost Estimate';
$lang->action->objectTypes['entry'] = 'Entry';
$lang->action->objectTypes['webhook'] = 'Webhook';
$lang->action->objectTypes['job'] = 'Job';
$lang->action->objectTypes['team'] = 'Team';
$lang->action->objectTypes['whitelist'] = 'Whitelist';
$lang->action->objectTypes['pipeline'] = 'GitLib';
$lang->action->objectTypes['gitlab'] = 'GitLab Server';
$lang->action->objectTypes['gitea'] = 'Gitea Server';
$lang->action->objectTypes['jenkins'] = 'Jenkins';
$lang->action->objectTypes['mr'] = 'Merge Request';
$lang->action->objectTypes['gitlabproject'] = 'GitLab Project';
$lang->action->objectTypes['gitlabuser'] = 'GitLab User';
$lang->action->objectTypes['gitlabgroup'] = 'GitLab Group';
$lang->action->objectTypes['gitlabbranch'] = 'GitLab Branch';
$lang->action->objectTypes['gitlabbranchpriv'] = 'GitLab Protected Branches';
$lang->action->objectTypes['gitlabtag'] = 'GitLab Tag';
$lang->action->objectTypes['gitlabtagpriv'] = 'GitLab Tag Protected';
$lang->action->objectTypes['kanbanspace'] = 'Kanban Space';
$lang->action->objectTypes['kanban'] = 'Kanban';
$lang->action->objectTypes['kanbanregion'] = 'Kanban Region';
$lang->action->objectTypes['kanbanlane'] = 'Kanban Lane';
$lang->action->objectTypes['kanbancolumn'] = 'Kanban Column';
$lang->action->objectTypes['kanbancard'] = 'Kanban Card';
$lang->action->objectTypes['sonarqube'] = 'SonarQube Server';
$lang->action->objectTypes['sonarqubeproject'] = 'SonarQube Project';
$lang->action->objectTypes['stage'] = 'Stage';
$lang->action->objectTypes['patch'] = 'Patch';
/* Used to describe operation history. */
$lang->action->desc = new stdclass();
@@ -462,6 +483,26 @@ $lang->action->dynamicAction->user['loginxuanxuan'] = 'Login Desktop';
$lang->action->dynamicAction->entry['created'] = 'Thêm ứng dụng';
$lang->action->dynamicAction->entry['edited'] = 'Sửa ứng dụng';
$lang->action->dynamicAction->job['created'] = 'Create Job';
$lang->action->dynamicAction->job['edited'] = 'Edit Job';
$lang->action->dynamicAction->job['executed'] = 'Execute Job';
$lang->action->dynamicAction->job['deleted'] = 'Delete Job';
$lang->action->dynamicAction->job['undeleted'] = 'Undelete Job';
$lang->action->dynamicAction->sonarqube['created'] = 'Create SonarQube Server';
$lang->action->dynamicAction->sonarqube['edited'] = 'Edit SonarQube Server';
$lang->action->dynamicAction->sonarqube['deleted'] = 'Delete SonarQube Server';
$lang->action->dynamicAction->sonarqubeproject['deleted'] = 'Delete SonarQube Project';
$lang->action->dynamicAction->gitlab['created'] = 'Create GitLab Server';
$lang->action->dynamicAction->gitlab['edited'] = 'Edit GitLab Server';
$lang->action->dynamicAction->gitlab['deleted'] = 'Delete GitLab Server';
$lang->action->dynamicAction->gitea['created'] = 'Create Gitea Server';
$lang->action->dynamicAction->gitea['edited'] = 'Edit Gitea Server';
$lang->action->dynamicAction->gitea['deleted'] = 'Delete Gitea Server';
/* Generate the corresponding object link. */
global $config;
$lang->action->label->product = $lang->productCommon . '|product|view|productID=%s';
module/action/lang/zh-cn.php
+6 -1
View File
@@ -123,6 +123,7 @@ $lang->action->objectTypes['team'] = '团队';
$lang->action->objectTypes['whitelist'] = '白名单';
$lang->action->objectTypes['pipeline'] = 'GitLab服务器';
$lang->action->objectTypes['gitlab'] = 'GitLab服务器';
$lang->action->objectTypes['gitea'] = 'Gitea服务器';
$lang->action->objectTypes['jenkins'] = 'Jenkins';
$lang->action->objectTypes['mr'] = '合并请求';
$lang->action->objectTypes['gitlabproject'] = 'GitLab项目';
@@ -632,9 +633,13 @@ $lang->action->dynamicAction->sonarqube['deleted'] = '删除SonarQube服务器';
$lang->action->dynamicAction->sonarqubeproject['deleted'] = '删除SonarQube项目';
$lang->action->dynamicAction->gitlab['created'] = '创建GitLab服务器';
$lang->action->dynamicAction->gitlab['edited'] = '设置GitLab服务器';
$lang->action->dynamicAction->gitlab['edited'] = '编辑GitLab服务器';
$lang->action->dynamicAction->gitlab['deleted'] = '删除GitLab服务器';
$lang->action->dynamicAction->gitea['created'] = '创建Gitea服务器';
$lang->action->dynamicAction->gitea['edited'] = '编辑Gitea服务器';
$lang->action->dynamicAction->gitea['deleted'] = '删除Gitea服务器';
/* 用来生成相应对象的链接。*/
$lang->action->label->product = $lang->productCommon . '|product|view|productID=%s';
$lang->action->label->productplan = "计划|productplan|view|productID=%s";
module/gitea/control.php
+5 -5
View File
@@ -135,12 +135,12 @@ class gitea extends control
{
if($confirm != 'yes') return print(js::confirm($this->lang->gitea->confirmDelete, inlink('delete', "id=$giteaID&confirm=yes")));
$oldGitea = $this->gitea->getByID($giteaID);
$this->gitea->delete(TABLE_PIPELINE, $giteaID);
$actionID = $this->dao->lastInsertID();
$gitea = $this->gitea->getByID($giteaID);
$changes = common::createChanges($oldGitea, $gitea);
$oldGitea = $this->loadModel('pipeline')->getByID($giteaID);
$actionID = $this->pipeline->delete($giteaID, 'gitea');
$gitea = $this->pipeline->getByID($giteaID);
$changes = common::createChanges($oldGitea, $gitea);
$this->loadModel('action')->logHistory($actionID, $changes);
return print(js::reload('parent'));
}