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

Merge branch 'devops19' into 'devops_caoyanyi_bug'

Browse Source 
# Conflicts:
#   module/job/control.php
This commit is contained in:
李玉春
2022-01-17 01:59:45 +00:00
parent 46fda60647 7c981830b6
commit 959560f680
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/action/lang/en.php
View File

@@ -571,6 +571,12 @@ $lang->action->dynamicAction->user['loginxuanxuan'] = 'Login Desktop';
$lang->action->dynamicAction->entry['created'] = 'Add Application';
$lang->action->dynamicAction->entry['edited'] = 'Edit Application';
$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';

6
module/action/lang/zh-cn.php
View File

@@ -571,6 +571,12 @@ $lang->action->dynamicAction->user['loginxuanxuan'] = '登录客户端';
$lang->action->dynamicAction->entry['created'] = '添加应用';
$lang->action->dynamicAction->entry['edited'] = '编辑应用';
$lang->action->dynamicAction->job['created'] = '创建构建任务';
$lang->action->dynamicAction->job['edited'] = '编辑构建任务';
$lang->action->dynamicAction->job['executed'] = '执行构建任务';
$lang->action->dynamicAction->job['deleted'] = '删除构建任务';
$lang->action->dynamicAction->job['undeleted'] = '还原构建任务';
$lang->action->dynamicAction->sonarqube['created'] = '创建SonarQube服务器';
$lang->action->dynamicAction->sonarqube['edited'] = '设置SonarQube服务器';
$lang->action->dynamicAction->sonarqube['deleted'] = '删除SonarQube服务器';

4
module/job/control.php
View File

@@ -88,6 +88,8 @@ class job extends control
}
return $this->send(array('result' => 'fail', 'message' => $errors));
}
$this->loadModel('action')->create('job', $jobID, 'created');
if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $jobID));
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
}
@@ -163,6 +165,8 @@ class job extends control
}
return $this->send(array('result' => 'fail', 'message' => $errors));
}
$this->loadModel('action')->create('job', $id, 'edited');
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
}