From db1c0ebb309b5295bd55011e4644fa3df3e55d09 Mon Sep 17 00:00:00 2001 From: dingguodong Date: Wed, 15 Sep 2021 10:57:05 +0800 Subject: [PATCH] * Merge codes for gitlab from 15.5. --- module/gitlab/control.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/gitlab/control.php b/module/gitlab/control.php index fc46a8057c..28eaf84610 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -71,7 +71,7 @@ class gitlab extends control if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); $this->loadModel('action'); - $actionID = $this->action->create('gitlab', $gitlabID, 'create'); + $actionID = $this->action->create('gitlab', $gitlabID, 'created'); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse'))); } @@ -117,7 +117,7 @@ class gitlab extends control if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); $this->loadModel('action'); - $actionID = $this->action->create('gitlab', $id, 'edit'); + $actionID = $this->action->create('gitlab', $id, 'edited'); $changes = common::createChanges($oldGitLab, $gitLab); $this->action->logHistory($actionID, $changes); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse'))); @@ -222,7 +222,7 @@ class gitlab extends control $this->gitlab->delete(TABLE_PIPELINE, $id); $gitLab = $this->gitlab->getByID($id); - $actionID = $this->action->create('gitlab', $id, 'delete'); + $actionID = $this->action->create('gitlab', $id, 'deleted'); $changes = common::createChanges($oldGitLab, $gitLab); $this->action->logHistory($actionID, $changes); die(js::reload('parent'));