From 8d303e4db19d49990fc250cb1093e87e3d379a94 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 12 Jan 2022 07:44:16 +0000
Subject: [PATCH 1/2] * Finish task #47227.

---
 module/action/lang/en.php    |  1 +
 module/action/lang/zh-cn.php |  1 +
 module/sonarqube/control.php | 22 ++++++++++++++++++++++
 module/sonarqube/model.php   | 18 +++++++++++++++---
 4 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index b739065286..6a151aa4f7 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -134,6 +134,7 @@ $lang->action->objectTypes['kanbanregion']     = 'Kanban Region';
 $lang->action->objectTypes['kanbanlane']       = 'Kanban Lane';
 $lang->action->objectTypes['kanbancolumn']     = 'Kanban Column';
 $lang->action->objectTypes['kanbancard']       = 'Kanban Card';
+$lang->action->objectTypes['sonarqube']        = 'SonarQube Server';
 
 /* Used to describe operation history. */
 $lang->action->desc = new stdclass();
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 851e8f58f4..6422067636 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -134,6 +134,7 @@ $lang->action->objectTypes['kanbanregion']     = '看板区域';
 $lang->action->objectTypes['kanbanlane']       = '看板泳道';
 $lang->action->objectTypes['kanbancolumn']     = '看板列';
 $lang->action->objectTypes['kanbancard']       = '看板卡片';
+$lang->action->objectTypes['sonarqube']        = 'SonarQube服务器';
 
 /* 用来描述操作历史记录。*/
 $lang->action->desc = new stdclass();
diff --git a/module/sonarqube/control.php b/module/sonarqube/control.php
index dec4397ee5..024e829d8f 100644
--- a/module/sonarqube/control.php
+++ b/module/sonarqube/control.php
@@ -112,4 +112,26 @@ class sonarqube extends control
     {
         echo $this->fetch('job', 'exec', "jobID=$jobID");
     }
+
+    /**
+     * Delete a sonarqube.
+     *
+     * @param  int    $sonarqubeID
+     * @access public
+     * @return void
+     */
+    public function delete($sonarqubeID, $confirm = 'no')
+    {
+        if($confirm != 'yes') die(js::confirm($this->lang->sonarqube->confirmDelete, inlink('delete', "id=$sonarqubeID&confirm=yes")));
+
+        $oldSonarQube = $this->sonarqube->getByID($sonarqubeID);
+        $this->loadModel('action');
+        $this->sonarqube->delete(TABLE_PIPELINE, $sonarqubeID);
+
+        $sonarQube = $this->sonarqube->getByID($sonarqubeID);
+        $actionID  = $this->action->create('sonarqube', $sonarqubeID, 'deleted');
+        $changes   = common::createChanges($oldSonarQube, $sonarQube);
+        $this->action->logHistory($actionID, $changes);
+        echo js::reload('parent');
+    }
 }
diff --git a/module/sonarqube/model.php b/module/sonarqube/model.php
index 13a6ecccc5..f0188a540a 100644
--- a/module/sonarqube/model.php
+++ b/module/sonarqube/model.php
@@ -42,13 +42,13 @@ class sonarqubeModel extends model
     /**
      * Get sonarqube api base url and header by id.
      *
-     * @param  int $id
+     * @param  int $sonarqubeID
      * @access public
      * @return array
      */
-    public function getApiBase($id)
+    public function getApiBase($sonarqubeID)
     {
-        $sonarqube = $this->loadModel('pipeline')->getByID($id);
+        $sonarqube = $this->loadModel('pipeline')->getByID($sonarqubeID);
         if(!$sonarqube) return '';
 
         $url      = rtrim($sonarqube->url, '/') . '/api/%s';
@@ -71,4 +71,16 @@ class sonarqubeModel extends model
         $header = 'Authorization: Basic ' . $token;
         return json_decode(commonModel::http($url, null, array(), $header));
     }
+
+    /**
+     * Get a sonarqube by id.
+     *
+     * @param  int $sonarqubeID
+     * @access public
+     * @return object
+     */
+    public function getByID($sonarqubeID)
+    {
+        return $this->loadModel('pipeline')->getByID($sonarqubeID);
+    }
 }

From e0fa6d70179c262d8a680be675fa0d8ceaf433b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=8E=89=E6=98=A5?= <563917701@qq.com>
Date: Wed, 12 Jan 2022 09:19:54 +0000
Subject: [PATCH 2/2] Update model.php

---
 module/sonarqube/model.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/module/sonarqube/model.php b/module/sonarqube/model.php
index f0188a540a..183f75f7f6 100644
--- a/module/sonarqube/model.php
+++ b/module/sonarqube/model.php
@@ -71,16 +71,4 @@ class sonarqubeModel extends model
         $header = 'Authorization: Basic ' . $token;
         return json_decode(commonModel::http($url, null, array(), $header));
     }
-
-    /**
-     * Get a sonarqube by id.
-     *
-     * @param  int $sonarqubeID
-     * @access public
-     * @return object
-     */
-    public function getByID($sonarqubeID)
-    {
-        return $this->loadModel('pipeline')->getByID($sonarqubeID);
-    }
 }