Redmine 4.1.1

app/views/roles/_form.html.erb

@@ -36,6 +36,7 @@
         </label>
       <% end %>
       <%= hidden_field_tag 'role[managed_role_ids][]', '' %>
+    </p>
   <% end %>
 
   <% if @role.new_record? && @roles.any? %>
@@ -46,9 +47,11 @@
 
 <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| %>
-    <fieldset><legend><%= mod.blank? ? l(:label_project) : l_or_humanize(mod, :prefix => 'project_module_') %></legend>
+    <% 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>
     <% perms_by_module[mod].each do |permission| %>
         <label class="floating">
         <%= check_box_tag 'role[permissions][]', permission.name, (@role.permissions.include? permission.name),
@@ -65,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">
@@ -77,8 +80,8 @@
       <% end %>
   </thead>
   <tbody>
-    <tr>
-      <td class="name"><b><%= l(:label_tracker_all) %></b></td>
+    <tr class='permissions-all-trackers'>
+      <td class="name"><%= toggle_checkboxes_link('tr.permissions-all-trackers input[type="checkbox"]') %><b><%= l(:label_tracker_all) %></b></td>
       <% permissions.each do |permission| %>
       <td class="<%= "#{permission}_shown" %>">
         <%= hidden_field_tag "role[permissions_all_trackers][#{permission}]", '0', :id => nil %>
@@ -91,8 +94,8 @@
       <% end %>
     </tr>
     <% Tracker.sorted.all.each do |tracker| %>
-    <tr>
-      <td class="name"><%= tracker.name %></td>
+    <tr class="permissions-tracker-<%= tracker.id %>">
+      <td class="name"><%= toggle_checkboxes_link("tr.permissions-tracker-#{tracker.id} input:enabled") %><%= tracker.name %></td>
       <% permissions.each do |permission| %>
       <td class="<%= "#{permission}_shown" %>"><%= check_box_tag "role[permissions_tracker_ids][#{permission}][]",
                 tracker.id,

app/views/roles/index.html.erb

@@ -9,11 +9,19 @@
   <thead><tr>
     <th><%=l(:label_role)%></th>
   <th></th>
+  <th></th>
   </tr></thead>
   <tbody>
 <% for role in @roles %>
   <tr class="<%= role.builtin? ? "builtin" : "givable" %>">
   <td class="name"><%= content_tag(role.builtin? ? 'em' : 'span', link_to(role.name, edit_role_path(role))) %></td>
+  <td>
+    <% unless role.builtin? || role.workflow_rules.exists? %>
+      <span class="icon icon-warning">
+        <%= l(:text_role_no_workflow) %> (<%= link_to l(:button_edit), workflows_edit_path(:role_id => role) %>)
+      </span>
+    <% end %>
+  </td>
   <td class="buttons">
     <%= reorder_handle(role) unless role.builtin? %>
     <%= link_to l(:button_copy), new_role_path(:copy => role), :class => 'icon icon-copy' %>

app/views/roles/permissions.html.erb

@@ -1,7 +1,29 @@
 <%= title [l(:label_role_plural), roles_path], l(:label_permissions_report) %>
 
+<div class="hide-when-print">
+  <fieldset id="filters" class="collapsible collapsed">
+    <legend onclick="toggleFieldset(this);" class="icon icon-collapsed"><%= l(:label_filter_plural) %></legend>
+    <div style="display: none;">
+      <%= form_tag({}, :method => :get) do %>
+        <% Role.sorted.to_a.each do |role| %>
+          <label>
+            <%= check_box_tag "ids[]", role.id, @roles.include?(role) %>
+            <%= role.name %>
+          </label>
+        <% end %>
+        <p>
+          <%= submit_tag l(:button_apply), :name => nil %>
+          <%= link_to l(:button_clear), permissions_roles_path, :class => 'icon icon-reload' %>
+        </p>
+      <% end %>
+    </div>
+  </fieldset>
+</div>
+
 <%= form_tag(permissions_roles_path, :id => 'permissions_form') do %>
-<%= hidden_field_tag 'permissions[0]', '', :id => nil %>
+<% @roles.each do |role| %>
+    <%= hidden_field_tag "permissions[#{role.id}][]", '', :id => nil %>
+<% end %>
 <div class="autoscroll">
 <table class="list permissions">
 <thead>
@@ -24,7 +46,7 @@
     <% unless mod.blank? %>
         <tr class="group open">
           <td>
-            <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
+            <span class="expander icon icon-expended" onclick="toggleRowGroup(this);">&nbsp;</span>
             <%= l_or_humanize(mod, :prefix => 'project_module_') %>
           </td>
           <% @roles.each do |role| %>

app/views/roles/show.api.rsb

@@ -1,6 +1,10 @@
 api.role do
   api.id @role.id
   api.name @role.name
+  api.assignable @role.assignable
+  api.issues_visibility @role.issues_visibility
+  api.time_entries_visibility @role.time_entries_visibility
+  api.users_visibility @role.users_visibility
   api.array :permissions do
     @role.permissions.each do |perm|
       api.permission(perm.to_s)