diff --git a/db/update12.1.sql b/db/update12.1.sql index 01bac9cb84..f8ebd60c85 100644 --- a/db/update12.1.sql +++ b/db/update12.1.sql @@ -77,4 +77,4 @@ CREATE TABLE `zt_cibuild` ( ) ENGINE=MyISAM AUTO_INCREMENT=15 DEFAULT CHARSET=utf8; INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES -('*/5', '*', '*', '*', '*', 'moduleName=ci&methodName=checkCibuild', '同步Jenkins任务状态', 'zentao', 1, 'normal', '0000-00-00 00:00:00'); +('*/5', '*', '*', '*', '*', 'moduleName=ci&methodName=checkCibuild', '同步Jenkins任务状态', 'zentao', -1, 'normal', '0000-00-00 00:00:00'); diff --git a/module/ci/control.php b/module/ci/control.php index dfded5fcd7..900a18ee8e 100644 --- a/module/ci/control.php +++ b/module/ci/control.php @@ -293,10 +293,6 @@ class ci extends control */ public function editCitask($id) { -// $pattern = $this->config->repo->commitCommands['entity']; -// $matches = array(); -// preg_match($pattern, 'fix bug #123',$matches); - $citask = $this->ci->getCitaskByID($id); if($_POST) { @@ -427,7 +423,8 @@ class ci extends control $this->view->users = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted'); $this->view->credentialList = $this->ci->listCredentialForSelection("type='sshKey' or type='account'"); - $this->view->module = 'repo'; + $this->view->tips = str_replace("{user}",exec('whoami'), $this->lang->repo->tips); + $this->view->module = 'repo'; $this->display(); } @@ -466,7 +463,8 @@ class ci extends control $this->view->users = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted'); $this->view->credentialList = $this->ci->listCredentialForSelection("type='sshKey' or type='account'"); - $this->view->module = 'repo'; + $this->view->tips = str_replace("{user}", exec('whoami'), $this->lang->repo->tips); + $this->view->module = 'repo'; $this->display(); } diff --git a/module/ci/lang/zh-cn.php b/module/ci/lang/zh-cn.php index d4afe57d58..40fb041b53 100644 --- a/module/ci/lang/zh-cn.php +++ b/module/ci/lang/zh-cn.php @@ -156,7 +156,8 @@ $lang->repo->error->output = "执行命令:%s\n错误结果(%s): %s\n $lang->repo->error->clientVersion = "客户端版本过低,请升级或更换SVN客户端"; $lang->repo->error->encoding = "编码可能错误,请更换编码重试。"; -$lang->repo->scmList['Subversion'] = 'Subversion'; +//$lang->repo->scmList['Subversion'] = 'Subversion'; $lang->repo->scmList['Git'] = 'Git'; +$lang->repo->tips = '请使用系统用户{user}签出代码,以便于获取后续的操作权限。如:sudo -u {user} git clone git_rep_address'; $lang->repo->watchList['1'] = ''; \ No newline at end of file diff --git a/module/ci/view/createrepo.html.php b/module/ci/view/createrepo.html.php index cb03ab293d..1e5e576807 100644 --- a/module/ci/view/createrepo.html.php +++ b/module/ci/view/createrepo.html.php @@ -26,6 +26,10 @@
+ + + + diff --git a/module/ci/view/editrepo.html.php b/module/ci/view/editrepo.html.php index 4c3746006e..388dc9c016 100644 --- a/module/ci/view/editrepo.html.php +++ b/module/ci/view/editrepo.html.php @@ -26,6 +26,10 @@
repo->type; ?> repo->scmList, 'git', "class='form-control'"); ?>
+ + + +
repo->type; ?> repo->scmList, $repo->SCM, "class='form-control'"); ?>