diff --git a/module/cron/view/index.html.php b/module/cron/view/index.html.php index 43a395b34e..ca46a62799 100644 --- a/module/cron/view/index.html.php +++ b/module/cron/view/index.html.php @@ -49,7 +49,7 @@ dow;?> command;?> remark;?> - lastTime, 2, 17);?> + lastTime ? substr($cron->lastTime, 2, 17) : '';?> cron->statusList, $cron->status, '');?> updateCommit($repo, $commentGroup, true); + if($repo->SCM == 'Gitlab') $this->loadModel('gitlab')->updateCodePath($repo->serviceHost, $repo->serviceProject, $repo->id); + /* Create compile by tag. */ $jobs = zget($tagGroup, $repoID, array()); foreach($jobs as $job) diff --git a/module/job/js/create.ui.js b/module/job/js/create.ui.js index f579efddc2..193cff2103 100644 --- a/module/job/js/create.ui.js +++ b/module/job/js/create.ui.js @@ -4,7 +4,7 @@ function changeEngine(event) if(engine == 'jenkins') { - $('.reference').removeClass('hidden'); + $('.reference').addClass('hidden'); } else { @@ -82,7 +82,7 @@ function changeRepo(event) if(data.type.indexOf('git') != -1) { var engine = $('[name=engine]').val(); - if(engine == 'jenkins') $('.reference').removeClass('hidden'); + //if(engine == 'jenkins') $('.reference').removeClass('hidden'); $('.reference').addClass('gitRepo'); $('.svn-fields').addClass('hidden'); diff --git a/module/job/js/edit.ui.js b/module/job/js/edit.ui.js index 21c4430322..3ded553541 100644 --- a/module/job/js/edit.ui.js +++ b/module/job/js/edit.ui.js @@ -75,7 +75,7 @@ function changeRepo(event) if(data.type.indexOf('git') != -1) { var engine = $('[name=engine]').val(); - if(engine == 'jenkins') $('.reference').removeClass('hidden'); + //if(engine == 'jenkins') $('.reference').removeClass('hidden'); $('.reference').addClass('gitRepo'); $('.svn-fields').addClass('hidden'); diff --git a/module/job/ui/edit.html.php b/module/job/ui/edit.html.php index ab33b1c042..c7f92bdb33 100644 --- a/module/job/ui/edit.html.php +++ b/module/job/ui/edit.html.php @@ -135,7 +135,7 @@ formPanel ), formGroup ( - $job->engine == 'jenkins' ? setClass('reference') : setClass('reference hidden'), + $job->engine == 'jenkins' ? setClass('reference hidden') : setClass('reference hidden'), set::labelWidth('5em'), set::label($lang->job->branch), set::required(true),