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/gitea/config/form.php
-3
View File
@@ -1,5 +1,4 @@
<?php
global $app;
$config->gitea->form = new stdclass();
$config->gitea->form->create = array();
$config->gitea->form->create['appType'] = array('type' => 'string', 'required' => true, 'default' => 'gitea');
@@ -7,7 +6,6 @@ $config->gitea->form->create['type'] = array('type' => 'string', 'require
$config->gitea->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitea->form->create['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitea->form->create['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitea->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->gitea->form->create['createdDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
$config->gitea->form->create['private'] = array('type' => 'string', 'required' => false, 'default' => uniqid());
@@ -15,5 +13,4 @@ $config->gitea->form->edit = array();
$config->gitea->form->edit['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitea->form->edit['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitea->form->edit['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->gitea->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->gitea->form->edit['editedDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
module/gitea/control.php
+6 -2
View File
@@ -71,7 +71,9 @@ class gitea extends control
{
if($_POST)
{
$gitea = form::data($this->config->gitea->form->create)->get();
$gitea = form::data($this->config->gitea->form->create)
->add('createdBy', $this->app->user->account)
->get();
$result = $this->checkToken($gitea);
if(is_array($result)) return $this->send($result);
@@ -118,7 +120,9 @@ class gitea extends control
if($_POST)
{
$gitea = form::data($this->config->gitea->form->edit)->get();
$gitea = form::data($this->config->gitea->form->edit)
->add('editedBy', $this->app->user->account)
->get();
$result = $this->checkToken($gitea);
if(is_array($result)) return $this->send($result);