Merge branch 'cyy_optimize' into 'zenops_41'

* Modify server delete tip. See merge request easycorp/zentaopms!4827
2022-08-08 09:23:07 +00:00
parent ff414a5fb5 382f4bf6c2
commit 73077e76bc
24 changed files with 63 additions and 18 deletions
@@ -228,11 +228,10 @@ class gitlab extends control
    {
        if($confirm != 'yes') return print(js::confirm($this->lang->gitlab->confirmDelete, inlink('delete', "id=$id&confirm=yes")));

-        $oldGitLab = $this->gitlab->getByID($id);
-        $this->loadModel('action');
-        $this->gitlab->delete(TABLE_PIPELINE, $id);
+        $oldGitLab = $this->loadModel('pipeline')->getByID($id);
+        $actionID  = $this->pipeline->delete($id, 'gitlab');
+        if(!$actionID) return print(js::error($this->lang->pipeline->delError));

-        $actionID = $this->dao->lastInsertID();
        $gitLab   = $this->gitlab->getByID($id);
        $changes  = common::createChanges($oldGitLab, $gitLab);
        $this->action->logHistory($actionID, $changes);