diff --git a/module/mr/js/create.js b/module/mr/js/create.js index b7effe1fa3..eecff36d0e 100644 --- a/module/mr/js/create.js +++ b/module/mr/js/create.js @@ -83,4 +83,10 @@ $(function() }); }); + $("#needCI").change(function() + { + if(this.checked == false) $("#jobID").parent().parent().addClass('hidden'); + if(this.checked == true) $("#jobID").parent().parent().removeClass('hidden'); + }); + }); diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php index d8f5aef3d3..797c1e5d25 100644 --- a/module/mr/lang/en.php +++ b/module/mr/lang/en.php @@ -34,6 +34,7 @@ $lang->mr->commits = 'commits'; $lang->mr->changes = 'changes'; $lang->mr->gitlabID = 'GitLab'; $lang->mr->repoID = 'Repo'; +$lang->mr->jobID = 'Compile job'; $lang->mr->approval = 'Approval'; $lang->mr->approve = 'Approve'; diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php index 63b2f93caa..566feef93c 100644 --- a/module/mr/lang/zh-cn.php +++ b/module/mr/lang/zh-cn.php @@ -34,6 +34,7 @@ $lang->mr->commits = '提交数'; $lang->mr->changes = '更改数'; $lang->mr->gitlabID = 'GitLab'; $lang->mr->repoID = '版本库'; +$lang->mr->jobID = '构建任务'; $lang->mr->canMerge = "可合并"; $lang->mr->cantMerge = "不可合并"; diff --git a/module/mr/model.php b/module/mr/model.php index 2c2e14fbe1..f52cdd77c4 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -85,6 +85,9 @@ class mrModel extends model public function create() { $MR = fixer::input('post') + ->setDefault('jobID', 0) + ->setDefault('repoID', 0) + ->setDefault('needCI', 0) ->add('createdBy', $this->app->user->account) ->add('createdDate', helper::now()) ->get(); @@ -103,6 +106,7 @@ class mrModel extends model $this->dao->insert(TABLE_MR)->data($MR, $this->config->mr->create->skippedFields) ->batchCheck($this->config->mr->create->requiredFields, 'notempty') + ->checkIF($MR->needCI, 'jobID', 'notempty') ->autoCheck() ->exec(); if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError()); diff --git a/module/mr/view/create.html.php b/module/mr/view/create.html.php index b009e58d5d..73daa976d0 100644 --- a/module/mr/view/create.html.php +++ b/module/mr/view/create.html.php @@ -51,6 +51,10 @@