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

* Move user account setting of gitlab.

Browse Source
This commit is contained in:
caoyanyi
2024-04-22 16:21:45 +08:00
parent f4b8e8e863
commit 59bf4d858d
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/config/form.php
-3
View File
@@ -1,5 +1,4 @@
<?php
global $app;
$config->gitlab->form = new stdclass();
$config->gitlab->form->create = array();
$config->gitlab->form->create['appType'] = array('type' => 'string', 'required' => true, 'default' => 'gitlab');
@@ -7,7 +6,6 @@ $config->gitlab->form->create['type'] = array('type' => 'string', 'requ
$config->gitlab->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitlab->form->create['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitlab->form->create['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitlab->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->gitlab->form->create['createdDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
$config->gitlab->form->create['private'] = array('type' => 'string', 'required' => false, 'default' => uniqid());
@@ -15,7 +13,6 @@ $config->gitlab->form->edit = array();
$config->gitlab->form->edit['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitlab->form->edit['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitlab->form->edit['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitlab->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->gitlab->form->edit['editedDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
$config->gitlab->form->user = new stdclass();
module/gitlab/control.php
+6 -2
View File
@@ -75,7 +75,9 @@ class gitlab extends control
{
if($_POST)
{
$gitlab = form::data($this->config->gitlab->form->create)->get();
$gitlab = form::data($this->config->gitlab->form->create)
->add('createdBy', $this->app->user->acount)
->get();
$this->checkToken($gitlab);
$gitlabID = $this->loadModel('pipeline')->create($gitlab);
@@ -123,7 +125,9 @@ class gitlab extends control
if($_POST)
{
$gitlab = form::data($this->config->gitlab->form->edit)->get();
$gitlab = form::data($this->config->gitlab->form->edit)
->add('editedBy', $this->app->user->acount)
->get();
$this->checkToken($gitlab, $gitlabID);
$this->loadModel('pipeline')->update($gitlabID, $gitlab);
$gitLab = $this->gitlab->getByID($gitlabID);