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/instance/config/form.php
-3
View File
@@ -1,5 +1,4 @@
<?php
global $app;
$config->instance->form = new stdclass();
$config->instance->form->create = array();
$config->instance->form->create['appType'] = array('type' => 'string', 'required' => true, 'default' => '');
@@ -7,7 +6,6 @@ $config->instance->form->create['name'] = array('type' => 'string', 'requ
$config->instance->form->create['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->instance->form->create['account'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->instance->form->create['password'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->instance->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => isset($app->user->account) ? $app->user->account : '');
$config->instance->form->create['createdDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
$config->instance->form->create['private'] = array('type' => 'string', 'required' => false, 'default' => uniqid());
@@ -16,7 +14,6 @@ $config->instance->form->edit['name'] = array('type' => 'string', 'require
$config->instance->form->edit['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->instance->form->edit['account'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->instance->form->edit['password'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->instance->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => isset($app->user->account) ? $app->user->account : '');
$config->instance->form->edit['editedDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
$config->instance->form->install = array();
module/instance/control.php
+6 -2
View File
@@ -203,7 +203,9 @@ class instance extends control
$this->loadModel('sonarqube');
$this->app->loadLang('pipeline');
$externalApp = form::data($this->config->instance->form->create)->get();
$externalApp = form::data($this->config->instance->form->create)
->add('createdBy', isset($this->app->user->account) ? $this->app->user->account : '')
->get();
$externalApp->type = $type;
$externalApp->url = rtrim($externalApp->url, '/');
if(!$this->instance->checkAppNameUnique($externalApp->name)) return $this->send(array('result' => false, 'message' => array('name' => sprintf($this->lang->error->repeat, $this->lang->pipeline->name, $externalApp->name))));
@@ -231,7 +233,9 @@ class instance extends control
if($_POST)
{
$instance = form::data($this->config->instance->form->edit)->get();
$instance = form::data($this->config->instance->form->edit)
->add('editedBy', isset($this->app->user->account) ? $this->app->user->account : '')
->get();
$this->pipeline->update($externalID, $instance);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));