From baf4a67ed8784ce90960c10e2011ef506193fcec Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Tue, 12 Apr 2022 09:51:09 +0800
Subject: [PATCH] * Fix bug #15633.

---
 config/zentaopms.php              |  1 +
 module/action/config.php          |  3 ++-
 module/action/view/trash.html.php |  4 ----
 module/api/control.php            |  3 +--
 module/api/model.php              | 15 ---------------
 5 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/config/zentaopms.php b/config/zentaopms.php
index 9b6cea5ead..dd24aaf97f 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -370,6 +370,7 @@ $config->objectTables['sonarqube']    = TABLE_PIPELINE;
 $config->objectTables['gitlab']       = TABLE_PIPELINE;
 $config->objectTables['jebkins']      = TABLE_PIPELINE;
 $config->objectTables['stage']        = TABLE_STAGE;
+$config->objectTables['apistruct']    = TABLE_APISTRUCT;
 
 $config->newFeatures = array('introduction', 'tutorial', 'youngBlueTheme', 'visions');
 
diff --git a/module/action/config.php b/module/action/config.php
index eeb7b831c8..43d361b476 100755
--- a/module/action/config.php
+++ b/module/action/config.php
@@ -43,6 +43,7 @@ $config->action->objectNameFields['kanbancard']   = 'name';
 $config->action->objectNameFields['sonarqube']    = 'name';
 $config->action->objectNameFields['gitlab']       = 'name';
 $config->action->objectNameFields['stage']        = 'name';
+$config->action->objectNameFields['apistruct']    = 'name';
 
 $config->action->commonImgSize = 870;
 
@@ -58,4 +59,4 @@ $config->action->majorList['execution'] = array('opened', 'edited');
 
 $config->action->needGetProjectType = 'build,task,bug,case,testcase,caselib,testtask,testsuite,testreport,doc,issue,release,risk,design,opportunity,trainplan,gapanalysis,researchplan,researchreport,';
 $config->action->needGetRelateField = ',story,productplan,release,task,build,bug,case,testtask,testreport,doc,doclib,issue,risk,opportunity,trainplan,gapanalysis,team,whitelist,researchplan,researchreport,meeting,kanbanlane,kanbancolumn,';
-$config->action->noLinkModules      = ',doclib,module,webhook,gitlab,sonarqube,pipeline,jenkins,kanban,kanbanspace,kanbancolumn,kanbanlane,kanbanregion,kanbancard,execution,project,traincategory,';
+$config->action->noLinkModules      = ',doclib,module,webhook,gitlab,sonarqube,pipeline,jenkins,kanban,kanbanspace,kanbancolumn,kanbanlane,kanbanregion,kanbancard,execution,project,traincategory,apistruct,program,';
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 2f00960c77..011ef69af1 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -76,10 +76,6 @@
             {
                 echo $action->objectName;
             }
-            elseif($action->objectType == 'program')
-            {
-                echo $action->objectName;
-            }
             else
             {
                 $tab = '';
diff --git a/module/api/control.php b/module/api/control.php
index 05d51bd5a6..3b788b81a7 100755
--- a/module/api/control.php
+++ b/module/api/control.php
@@ -300,9 +300,8 @@ class api extends control
         }
         else
         {
-            $this->api->deleteStruct($structID);
+            $this->api->delete(TABLE_APISTRUCT, $structID);
             if(dao::isError()) return $this->sendError(dao::getError());
-            $this->action->create('apistruct', $structID, 'Deleted');
             return print(js::locate(inlink('struct', "libID=$libID"), 'parent'));
         }
     }
diff --git a/module/api/model.php b/module/api/model.php
index ba6fb7259c..4454e040a2 100644
--- a/module/api/model.php
+++ b/module/api/model.php
@@ -173,21 +173,6 @@ class apiModel extends model
         return common::createChanges($old, $data);
     }
 
-    /**
-     * Delete a struct.
-     *
-     * @param  int $id
-     * @access public
-     * @return void
-     */
-    public function deleteStruct($id)
-    {
-        $this->dao->update(TABLE_APISTRUCT)
-            ->set('deleted')->eq(1)
-            ->where('id')->eq($id)
-            ->exec();
-    }
-
     /**
      * Update an api doc.
      *