Skip to content

Commit 1c2f545

Browse files
move menus and permissions to Redmine init plugin to solve conflicts with hidding modules with additionals
1 parent 208bdb8 commit 1c2f545

File tree

5 files changed

+40
-47
lines changed

5 files changed

+40
-47
lines changed

Diff for: .rubocop.yml

+3
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ Rails/ApplicationJob:
4949
Rails/ApplicationRecord:
5050
Enabled: false
5151

52+
Lint/AmbiguousOperatorPrecedence:
53+
Enabled: false
54+
5255
Rails/CreateTableWithTimestamps:
5356
Enabled: false
5457

Diff for: init.rb

+37-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,42 @@
1414
settings partial: 'settings/redmine_git_hosting', default: RedmineGitHosting.settings
1515
requires_redmine version_or_higher: '4.1.0'
1616

17+
permission :create_gitolite_ssh_key, gitolite_public_keys: %i[index create destroy], require: :loggedin
18+
19+
project_module :repository do
20+
permission :create_repository_mirrors, repository_mirrors: %i[new create]
21+
permission :view_repository_mirrors, repository_mirrors: %i[indexshow]
22+
permission :edit_repository_mirrors, repository_mirrors: %i[edit update destroy]
23+
permission :push_repository_mirrors, repository_mirrors: [:push]
24+
25+
permission :create_repository_post_receive_urls, repository_post_receive_urls: %i[new create]
26+
permission :view_repository_post_receive_urls, repository_post_receive_urls: %i[index show]
27+
permission :edit_repository_post_receive_urls, repository_post_receive_urls: %i[edit update destroy]
28+
29+
permission :create_repository_deployment_credentials, repository_deployment_credentials: %i[new create]
30+
permission :view_repository_deployment_credentials, repository_deployment_credentials: %i[index show]
31+
permission :edit_repository_deployment_credentials, repository_deployment_credentials: %i[edit update destroy]
32+
33+
permission :create_repository_git_config_keys, repository_git_config_keys: %i[new create]
34+
permission :view_repository_git_config_keys, repository_git_config_keys: %i[index show]
35+
permission :edit_repository_git_config_keys, repository_git_config_keys: %i[edit update destroy]
36+
37+
permission :create_repository_protected_branches, repository_protected_branches: %i[new create]
38+
permission :view_repository_protected_branches, repository_protected_branches: %i[index show]
39+
permission :edit_repository_protected_branches, repository_protected_branches: %i[edit update destroy]
40+
41+
permission :view_repository_xitolite_watchers, repositories: :show
42+
permission :add_repository_xitolite_watchers, watchers: :create
43+
permission :delete_repository_xitolite_watchers, watchers: :destroy
44+
45+
permission :download_git_revision, download_git_revision: :index
46+
end
47+
48+
menu :admin_menu,
49+
:redmine_git_hosting,
50+
{ controller: 'settings', action: 'plugin', id: 'redmine_git_hosting' },
51+
caption: :redmine_git_hosting
52+
1753
menu :project_menu,
1854
:new_repository,
1955
{ controller: 'repositories', action: 'new' },
@@ -22,7 +58,7 @@
2258
parent: :new_object
2359

2460
begin
25-
requires_redmine_plugin :additionals, version_or_higher: '3.0.2'
61+
requires_redmine_plugin :additionals, version_or_higher: '3.0.3'
2662
rescue Redmine::PluginNotFound
2763
raise 'Please install additionals plugin (https://github.com/alphanodes/additionals)'
2864
end

Diff for: lib/redmine_git_hosting.rb

-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
# frozen_string_literal: true
22

3-
# Redmine Permissions
4-
require 'redmine_permissions'
5-
6-
# Redmine Menus
7-
require 'redmine_menus'
8-
93
# Redmine Hooks
104
require 'redmine_git_hosting/hooks'
115

Diff for: lib/redmine_menus.rb

-6
This file was deleted.

Diff for: lib/redmine_permissions.rb

-34
This file was deleted.

0 commit comments

Comments
 (0)