diff --git a/module/job/model.php b/module/job/model.php index 7a6207ac4e..c2c99450e5 100644 --- a/module/job/model.php +++ b/module/job/model.php @@ -117,19 +117,19 @@ class jobModel extends model ->setDefault('atDay', '') ->add('createdBy', $this->app->user->account) ->add('createdDate', helper::now()) - ->remove('repoType') + ->remove('repoType,gitlabRepo') ->get(); if($job->engine == 'jenkins') { - $job->server = zget($job, 'jkServer', ''); + $job->server = (int)zget($job, 'jkServer', 0); $job->pipeline = zget($job, 'jkTask', ''); } if(strtolower($job->engine) == 'gitlab') { $repo = $this->loadModel('repo')->getRepoByID($job->repo); - $job->server = zget($repo, 'gitlab', ''); + $job->server = (int)zget($repo, 'gitlab', 0); $job->pipeline = zget($repo, 'project', ''); } @@ -206,14 +206,14 @@ class jobModel extends model if($job->engine == 'jenkins') { - $job->server = zget($job, 'jkServer', ''); + $job->server = (int)zget($job, 'jkServer', 0); $job->pipeline = zget($job, 'jkTask', ''); } if(strtolower($job->engine) == 'gitlab') { $repo = $this->loadModel('repo')->getRepoByID($job->repo); - $job->server = zget($repo, 'gitlab', ''); + $job->server = (int)zget($repo, 'gitlab', 0); $job->pipeline = zget($repo, 'project', ''); } diff --git a/module/job/view/edit.html.php b/module/job/view/edit.html.php index b318c8d3fa..14f0d7ae79 100644 --- a/module/job/view/edit.html.php +++ b/module/job/view/edit.html.php @@ -34,7 +34,7 @@