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

Merge remote-tracking branch 'origin/release-20.0'

Browse Source
This commit is contained in:
tianshujie
2024-04-23 17:12:24 +08:00
parent 63d51564de 8856db689c
commit bced2b76b4
191 changed files with 1353 additions and 866 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/job/config/form.php
-3
View File
@@ -1,7 +1,6 @@
<?php
$now = helper::now();
global $app;
$config->job->form = new stdclass();
$config->job->form->create = array();
@@ -23,7 +22,6 @@ $config->job->form->create['jkServer'] = array('type' => 'int', 'requi
$config->job->form->create['jkTask'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->job->form->create['paramName'] = array('type' => 'array', 'required' => false, 'default' => array());
$config->job->form->create['paramValue'] = array('type' => 'array', 'required' => false, 'default' => array());
$config->job->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->job->form->create['createdDate'] = array('type' => 'string', 'required' => false, 'default' => $now);
$config->job->form->edit = array();
@@ -45,5 +43,4 @@ $config->job->form->edit['jkServer'] = array('type' => 'int', 'require
$config->job->form->edit['jkTask'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->job->form->edit['paramName'] = array('type' => 'array', 'required' => false, 'default' => array());
$config->job->form->edit['paramValue'] = array('type' => 'array', 'required' => false, 'default' => array());
$config->job->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->job->form->edit['editedDate'] = array('type' => 'string', 'required' => false, 'default' => $now);
module/job/control.php
+2
View File
@@ -100,6 +100,7 @@ class job extends control
->setIF($this->post->useZentao != '1' || $this->post->triggerType != 'tag', 'lastTag', '')
->setIF($this->post->frame != 'sonarqube', 'sonarqubeServer', 0)
->setIF($this->post->frame != 'sonarqube', 'projectKey', '')
->add('createdBy', $this->app->user->account)
->get();
$jobID = $this->job->create($job);
@@ -142,6 +143,7 @@ class job extends control
->setIF($this->post->useZentao != '1' || $this->post->triggerType != 'tag', 'lastTag', '')
->setIF($this->post->frame != 'sonarqube', 'sonarqubeServer', 0)
->setIF($this->post->frame != 'sonarqube', 'projectKey', '')
->add('editedBy', $this->app->user->account)
->get();
$this->job->update($jobID, $job);