summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-09-24 04:18:44 +0000
committerGo MAEDA <maeda@farend.jp>2019-09-24 04:18:44 +0000
commitca16a23ad5ad235ec2b981750fb8dbb09e208d2d (patch)
treebfa3683fe2957b4fddcd50773a92f3f3d468a4d1 /app
parentfb221e80691ec4bbdbea8b4e40af221839fb5d4c (diff)
downloadredmine-ca16a23ad5ad235ec2b981750fb8dbb09e208d2d.tar.gz
redmine-ca16a23ad5ad235ec2b981750fb8dbb09e208d2d.zip
Don't show unsettable permissions in the tracker permissions table (#30431).
Patch by Yuichi HARADA. git-svn-id: http://svn.redmine.org/redmine/trunk@18508 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/views/roles/_form.html.erb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/roles/_form.html.erb b/app/views/roles/_form.html.erb
index 4a49d53de..e149b0011 100644
--- a/app/views/roles/_form.html.erb
+++ b/app/views/roles/_form.html.erb
@@ -47,7 +47,8 @@
<h3><%= l(:label_permissions) %></h3>
<div class="box tabular" id="permissions">
-<% perms_by_module = @role.setable_permissions.group_by {|p| p.project_module.to_s} %>
+<% setable_permissions = @role.setable_permissions %>
+<% perms_by_module = setable_permissions.group_by {|p| p.project_module.to_s} %>
<% perms_by_module.keys.sort.each do |mod| %>
<% module_name = mod.blank? ? 'module_project' : "module_#{mod}" %>
<fieldset id="<%= module_name %>"><legend><%= toggle_checkboxes_link("##{module_name}\ input") %><%= mod.blank? ? l(:label_project) : l_or_humanize(mod, :prefix => 'project_module_') %></legend>
@@ -67,7 +68,7 @@
<div id="role-permissions-trackers" class="view_issues_shown">
<h3><%= l(:label_issue_tracking) %></h3>
-<% permissions = %w(view_issues add_issues edit_issues add_issue_notes delete_issues) %>
+<% permissions = [:view_issues, :add_issues, :edit_issues, :add_issue_notes, :delete_issues] & setable_permissions.collect(&:name) %>
<div class="autoscroll">
<table class="list">