diff --git a/config/zentaopms.php b/config/zentaopms.php index 5d1ef5ed25..92c0abb799 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -291,6 +291,9 @@ $config->objectTables['kanbanlane'] = TABLE_KANBANLANE; $config->objectTables['kanbanorder'] = TABLE_KANBANORDER; $config->objectTables['kanbangroup'] = TABLE_KANBANGROUP; $config->objectTables['kanbancard'] = TABLE_KANBANCARD; +$config->objectTables['sonarqube'] = TABLE_PIPELINE; +$config->objectTables['gitlab'] = TABLE_PIPELINE; +$config->objectTables['jebkins'] = TABLE_PIPELINE; $config->newFeatures = array('introduction', 'tutorial', 'youngBlueTheme'); diff --git a/module/action/config.php b/module/action/config.php index c40a551519..4a34009243 100755 --- a/module/action/config.php +++ b/module/action/config.php @@ -40,6 +40,7 @@ $config->action->objectNameFields['kanbanspace'] = 'name'; $config->action->objectNameFields['kanbanregion'] = 'name'; $config->action->objectNameFields['kanban'] = 'name'; $config->action->objectNameFields['kanbancard'] = 'name'; +$config->action->objectNameFields['sonarqube'] = 'name'; $config->action->commonImgSize = 870; diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 6a151aa4f7..87d4d41875 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -570,6 +570,14 @@ $lang->action->dynamicAction->user['loginxuanxuan'] = 'Login Desktop'; $lang->action->dynamicAction->entry['created'] = 'Add Application'; $lang->action->dynamicAction->entry['edited'] = 'Edit Application'; +$lang->action->dynamicAction->sonarqube['created'] = 'Create SonarQube Server'; +$lang->action->dynamicAction->sonarqube['edited'] = 'Edit SonarQube Server'; +$lang->action->dynamicAction->sonarqube['deleted'] = 'Delete SonarQube Server'; + +$lang->action->dynamicAction->gitlab['created'] = 'Create GitLab Server'; +$lang->action->dynamicAction->gitlab['edited'] = 'Edit GitLab Server'; +$lang->action->dynamicAction->gitlab['deleted'] = 'Delete GitLab Server'; + /* Generate the corresponding object link. */ $lang->action->label->product = $lang->productCommon . '|product|view|productID=%s'; $lang->action->label->productplan = 'Plan|productplan|view|productID=%s'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 6422067636..4e8eb9b35b 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -570,6 +570,14 @@ $lang->action->dynamicAction->user['loginxuanxuan'] = '登录客户端'; $lang->action->dynamicAction->entry['created'] = '添加应用'; $lang->action->dynamicAction->entry['edited'] = '编辑应用'; +$lang->action->dynamicAction->sonarqube['created'] = '创建SonarQube服务器'; +$lang->action->dynamicAction->sonarqube['edited'] = '设置SonarQube服务器'; +$lang->action->dynamicAction->sonarqube['deleted'] = '删除SonarQube服务器'; + +$lang->action->dynamicAction->gitlab['created'] = '创建GitLab服务器'; +$lang->action->dynamicAction->gitlab['edited'] = '设置GitLab服务器'; +$lang->action->dynamicAction->gitlab['deleted'] = '删除GitLab服务器'; + /* 用来生成相应对象的链接。*/ $lang->action->label->product = $lang->productCommon . '|product|view|productID=%s'; $lang->action->label->productplan = "计划|productplan|view|productID=%s"; diff --git a/module/gitlab/view/browse.html.php b/module/gitlab/view/browse.html.php index b682227146..137e6d80b0 100644 --- a/module/gitlab/view/browse.html.php +++ b/module/gitlab/view/browse.html.php @@ -32,7 +32,7 @@ recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> - gitlab->id);?> + gitlab->id);?> gitlab->name);?> gitlab->url);?> actions;?> diff --git a/module/pipeline/model.php b/module/pipeline/model.php index 6fc6fde9d2..5fbe19c650 100644 --- a/module/pipeline/model.php +++ b/module/pipeline/model.php @@ -122,4 +122,20 @@ class pipelineModel extends model return !dao::isError(); } + + /** + * Delete one record. + * + * @param string $id the id to be deleted + * @param string $object the action object + * @access public + * @return bool + */ + public function delete($id, $object = 'gitlab') + { + $this->dao->update(TABLE_PIPELINE)->set('deleted')->eq(1)->where('id')->eq($id)->exec(); + $this->loadModel('action')->create($object, $id, 'deleted', '', ACTIONMODEL::CAN_UNDELETED); + + return true; + } } diff --git a/module/sonarqube/control.php b/module/sonarqube/control.php index 67535faa78..d525c4cbb4 100644 --- a/module/sonarqube/control.php +++ b/module/sonarqube/control.php @@ -110,14 +110,13 @@ class sonarqube extends control */ public function delete($sonarqubeID, $confirm = 'no') { - if($confirm != 'yes') die(js::confirm($this->lang->sonarqube->confirmDelete, inlink('delete', "id=$sonarqubeID&confirm=yes"))); + if($confirm != 'yes') die(js::confirm($this->lang->sonarqube->confirmDelete, inlink('delete', "sonarqubeID=$sonarqubeID&confirm=yes"))); $oldSonarQube = $this->sonarqube->getByID($sonarqubeID); $this->loadModel('action'); - $this->sonarqube->delete(TABLE_PIPELINE, $sonarqubeID); + $this->loadModel('pipeline')->delete($sonarqubeID, 'sonarqube'); $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/view/browse.html.php b/module/sonarqube/view/browse.html.php index 3048164339..c41334e3be 100644 --- a/module/sonarqube/view/browse.html.php +++ b/module/sonarqube/view/browse.html.php @@ -32,7 +32,7 @@ recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> - sonarqube->id);?> + sonarqube->id);?> sonarqube->name);?> sonarqube->url);?> actions;?>