From cf70dd5c7d89dd30b0e5406590ab81d0565795b4 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Mon, 22 Apr 2024 16:21:42 +0800
Subject: [PATCH] * Move user account setting of instance.

---
 module/instance/config/form.php | 3 ---
 module/instance/control.php     | 8 ++++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/module/instance/config/form.php b/module/instance/config/form.php
index c25da1481f..041a8abda8 100644
--- a/module/instance/config/form.php
+++ b/module/instance/config/form.php
@@ -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();
diff --git a/module/instance/control.php b/module/instance/control.php
index 1228c49bf1..9b42eb9b8f 100644
--- a/module/instance/control.php
+++ b/module/instance/control.php
@@ -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()));