Skip to content

Commit 76ce08d

Browse files
author
root
committed
Fix permissions for Repository watchers
1 parent c5b4603 commit 76ce08d

File tree

4 files changed

+10
-1
lines changed

4 files changed

+10
-1
lines changed

Diff for: app/views/repositories/_sidebar.html.haml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
= link_to_repository(repo, @repository)
55
= link_to "(#{l(:label_settings)})", edit_repository_path(repo) if User.current.allowed_to?(:manage_repository, @project)
66

7-
- if User.current.allowed_to?(:add_issue_watchers, @project) || (@repository.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project))
7+
- if User.current.allowed_to?(:add_repository_xitolite_watchers, @project) || (@repository.watchers.present? && User.current.allowed_to?(:view_repository_xitolite_watchers, @project))
88
#watchers= render 'watchers/watchers', watched: @repository
99

1010
:javascript

Diff for: config/locales/permissions/en.yml

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ en:
2222
permission_view_repository_protected_branches: View protected branches
2323
permission_edit_repository_protected_branches: Edit protected branches
2424

25+
permission_view_repository_xitolite_watchers: View watchers
26+
permission_add_repository_xitolite_watchers: Add watchers
2527
permission_delete_repository_xitolite_watchers: Delete watchers
28+
2629
permission_create_gitolite_ssh_key: Create SSH keys
2730
permission_download_git_revision: Download Git Revision Archive

Diff for: config/locales/permissions/fr.yml

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ fr:
2222
permission_view_repository_protected_branches: Voir des branches protégées
2323
permission_edit_repository_protected_branches: Modifier des branches protégées
2424

25+
permission_view_repository_xitolite_watchers: Voir la liste des observateurs
26+
permission_add_repository_xitolite_watchers: Ajouter des observateurs
2527
permission_delete_repository_xitolite_watchers: Supprimer des observateurs
28+
2629
permission_create_gitolite_ssh_key: Créer des clés SSH
2730
permission_download_git_revision: Télécharger les révisions Git sous forme d'archive

Diff for: lib/redmine_permissions.rb

+3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
map.permission :view_repository_protected_branches, repository_protected_branches: [:index, :show]
2424
map.permission :edit_repository_protected_branches, repository_protected_branches: [:edit, :update, :destroy]
2525

26+
map.permission :view_repository_xitolite_watchers, repositories: :show
27+
map.permission :add_repository_xitolite_watchers, watchers: :create
2628
map.permission :delete_repository_xitolite_watchers, watchers: :destroy
29+
2730
map.permission :download_git_revision, download_git_revision: :index
2831
end
2932
end

0 commit comments

Comments
 (0)