diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 6a3d7c2ade..1e9678ea2a 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -344,6 +344,7 @@ $lang->action->label->importedrelease = 'imported'; $lang->action->label->importedexecution = 'imported'; $lang->action->label->importedbuild = 'imported'; $lang->action->label->fromsonarqube = 'created a bug from SonarQube Issue named:'; +$lang->action->label->binduser = 'bind user'; /* Dynamic information is grouped by object. */ $lang->action->dynamicAction = new stdclass; @@ -823,3 +824,4 @@ $lang->action->desc->deletemr = '$date, $actoraction->desc->mergedmr = '$date, $actor merged code.'; $lang->action->desc->approve = '$date, $actor approved.'; $lang->action->desc->reject = '$date, $actor rejected.'; +$lang->action->desc->binduser = '$date, $actor modified bound user.'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 52420d2963..5d76e75bd2 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -344,6 +344,7 @@ $lang->action->label->importedrelease = '导入了'; $lang->action->label->importedexecution = '导入了'; $lang->action->label->importedbuild = '导入了'; $lang->action->label->fromsonarqube = '由SonarQube问题创建'; +$lang->action->label->binduser = '绑定用户了'; /* 动态信息按照对象分组 */ $lang->action->dynamicAction = new stdclass(); @@ -823,3 +824,4 @@ $lang->action->desc->deletemr = '$date, 由 $actoraction->desc->mergedmr = '$date, 由 $actor 合并了 代码。'; $lang->action->desc->approve = '$date, 由 $actor 审核通过。'; $lang->action->desc->reject = '$date, 由 $actor 拒绝。'; +$lang->action->desc->binduser = '$date, 由 $actor 修改了绑定用户。'; diff --git a/module/gitlab/control.php b/module/gitlab/control.php index ae10a06ec4..724aab2b40 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -185,6 +185,7 @@ class gitlab extends control $this->dao->insert(TABLE_OAUTH)->data($user)->exec(); } + $this->loadModel('action')->create('gitlab', $gitlabID, 'binduser'); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->server->http_referer)); } diff --git a/module/mr/model.php b/module/mr/model.php index 7851aa6ce8..0257ab0adc 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -184,7 +184,6 @@ 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/repo/model.php b/module/repo/model.php index 60aaf3af89..7e3deb9a21 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -1372,7 +1372,7 @@ class repoModel extends model { $tasks[$id] = $id; $actions['task'][$id]['start']['consumed'] = $matches[11][$i]; - $actions['task'][$id]['start']['left'] = $matches[16][$i]; + $actions['task'][$id]['start']['left'] = $matches[17][$i]; } } }