Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* fix for create job.

Browse Source
This commit is contained in:
wangyidong
2021-08-05 16:56:29 +08:00
parent 249f29ddf1
commit 9edf5f89e1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/job/model.php
+5 -5
View File
@@ -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', '');
}
module/job/view/edit.html.php
+1 -1
View File
@@ -34,7 +34,7 @@
</tr>
<tr>
<th><?php echo $lang->job->engine;?></th>
<td class='required'><?php echo zget($lang->job->engineList, $job->engine, '') . html::hidden('engine', $job->engine);?>
<td><?php echo zget($lang->job->engineList, $job->engine, '') . html::hidden('engine', $job->engine);?>
</td>
</tr>
<tr>