diff --git a/db/zentao.sql b/db/zentao.sql index 7c2d38a8c5..4134d18a4e 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -2331,7 +2331,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'git','apiSync'), (1,'git','cat'), (1,'git','diff'), -(1,'gitlab','bindProduct'), (1,'gitlab','bindUser'), (1,'gitlab','browse'), (1,'gitlab','create'), @@ -5280,7 +5279,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (8,'git','apiSync'), (8,'git','cat'), (8,'git','diff'), -(8,'gitlab','bindProduct'), (8,'gitlab','bindUser'), (8,'gitlab','browse'), (8,'gitlab','create'), diff --git a/module/gitlab/control.php b/module/gitlab/control.php index 33cfacfc41..a1d10ab6cb 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -196,20 +196,6 @@ class gitlab extends control $this->display(); } - /** - * Bind product and gitlab projects. - * - * @param int $gitlabID - * @access public - * @return void - */ - public function bindProduct($gitlabID) - { - $this->view->projectPairs = $this->gitlab->getProjectPairs($gitlabID); - $this->view->title = $this->lang->gitlab->bindProduct; - $this->display(); - } - /** * Delete a gitlab. * diff --git a/module/gitlab/lang/de.php b/module/gitlab/lang/de.php index cf37e4bbec..1a336f263c 100644 --- a/module/gitlab/lang/de.php +++ b/module/gitlab/lang/de.php @@ -7,7 +7,6 @@ $lang->gitlab->edit = 'Edit GitLab'; $lang->gitlab->view = 'View GitLab'; $lang->gitlab->bindUser = 'Bind User'; $lang->gitlab->webhook = 'Webhook'; -$lang->gitlab->bindProduct = "Import {$lang->productCommon}"; $lang->gitlab->importIssue = 'Import Issue'; $lang->gitlab->delete = 'Delete GitLab'; $lang->gitlab->confirmDelete = 'Do you want to delete this GitLab server?'; diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php index cf37e4bbec..1a336f263c 100644 --- a/module/gitlab/lang/en.php +++ b/module/gitlab/lang/en.php @@ -7,7 +7,6 @@ $lang->gitlab->edit = 'Edit GitLab'; $lang->gitlab->view = 'View GitLab'; $lang->gitlab->bindUser = 'Bind User'; $lang->gitlab->webhook = 'Webhook'; -$lang->gitlab->bindProduct = "Import {$lang->productCommon}"; $lang->gitlab->importIssue = 'Import Issue'; $lang->gitlab->delete = 'Delete GitLab'; $lang->gitlab->confirmDelete = 'Do you want to delete this GitLab server?'; diff --git a/module/gitlab/lang/fr.php b/module/gitlab/lang/fr.php index cf37e4bbec..1a336f263c 100644 --- a/module/gitlab/lang/fr.php +++ b/module/gitlab/lang/fr.php @@ -7,7 +7,6 @@ $lang->gitlab->edit = 'Edit GitLab'; $lang->gitlab->view = 'View GitLab'; $lang->gitlab->bindUser = 'Bind User'; $lang->gitlab->webhook = 'Webhook'; -$lang->gitlab->bindProduct = "Import {$lang->productCommon}"; $lang->gitlab->importIssue = 'Import Issue'; $lang->gitlab->delete = 'Delete GitLab'; $lang->gitlab->confirmDelete = 'Do you want to delete this GitLab server?'; diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php index 8483edf40c..0f450893f6 100644 --- a/module/gitlab/lang/zh-cn.php +++ b/module/gitlab/lang/zh-cn.php @@ -7,7 +7,6 @@ $lang->gitlab->edit = '编辑GitLab'; $lang->gitlab->view = '查看GitLab'; $lang->gitlab->bindUser = '绑定用户'; $lang->gitlab->webhook = 'Webhook'; -$lang->gitlab->bindProduct = "关联{$lang->productCommon}"; $lang->gitlab->importIssue = '关联issue'; $lang->gitlab->delete = '删除GitLab'; $lang->gitlab->confirmDelete = '确认删除该GitLab吗?'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 5dc349bc6f..c4b560b351 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1469,7 +1469,6 @@ $lang->resource->gitlab->view = 'view'; $lang->resource->gitlab->importIssue = 'importIssue'; $lang->resource->gitlab->delete = 'delete'; $lang->resource->gitlab->bindUser = 'bindUser'; -$lang->resource->gitlab->bindProduct = 'bindProduct'; $lang->resource->gitlab->browseProject = 'browseProject'; $lang->resource->gitlab->createProject = 'createProject'; $lang->resource->gitlab->editProject = 'editProject';