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/gitfox/config/form.php
-3
View File
@@ -1,5 +1,4 @@
<?php
global $app;
$config->gitfox->form = new stdclass();
$config->gitfox->form->create = array();
$config->gitfox->form->create['appType'] = array('type' => 'string', 'required' => true, 'default' => 'gitfox');
@@ -7,7 +6,6 @@ $config->gitfox->form->create['type'] = array('type' => 'string', 'requ
$config->gitfox->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitfox->form->create['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitfox->form->create['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitfox->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->gitfox->form->create['createdDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
$config->gitfox->form->create['private'] = array('type' => 'string', 'required' => false, 'default' => uniqid());
@@ -15,5 +13,4 @@ $config->gitfox->form->edit = array();
$config->gitfox->form->edit['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitfox->form->edit['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitfox->form->edit['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitfox->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->gitfox->form->edit['editedDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
module/gitfox/control.php
+6 -2
View File
@@ -22,7 +22,9 @@ class gitfox extends control
{
if($_POST)
{
$gitfox = form::data($this->config->gitfox->form->create)->get();
$gitfox = form::data($this->config->gitfox->form->create)
->add('createdBy', $this->app->user->account)
->get();
$this->checkToken($gitfox);
$gitfoxID = $this->loadModel('pipeline')->create($gitfox);
@@ -51,7 +53,9 @@ class gitfox extends control
if($_POST)
{
$gitfox = form::data($this->config->gitfox->form->edit)->get();
$gitfox = form::data($this->config->gitfox->form->edit)
->add('editedBy', $this->app->user->account)
->get();
$this->checkToken($gitfox, $gitfoxID);
$this->loadModel('pipeline')->update($gitfoxID, $gitfox);
$gitFox = $this->gitfox->fetchByID($gitfoxID);