Group user accounts by role

Replaces the two-way admin/user split with four groups ordered by
capability: administration, Redaktion, editors, alumni. alumni takes
precedence over capability in role_group, so a retired admin appears at the
bottom rather than the top.

Forms now offer the three roles as checkboxes rather than a single admin
checkbox, with a trailing hidden blank so an empty set can be posted, and
user_params permits roles only for admins. Three create buttons prefill the
common combinations.

5 files changed, 67 insertions, 35 deletions

diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index 9c6466a2..04884be8 100644
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -1,11 +1,16 @@
 <% users.each do |user| %>
 <tr>
   <td class="user_login"><%= user.login %></td>
-  <td><%= link_to "show", user_path(user) %></td>
-  <% if current_user.admin? || current_user == user %>
-  <td>
-    <%= link_to "edit", edit_user_path(user) %>
+  <td class="user_roles">
+    <% if user.roles.any? %>
+      <%= user.role_labels.join(", ") %>
+    <% else %>
+      <span class="field_hint"><%= t(".no_roles") %></span>
+    <% end %>
   </td>
+  <td><%= link_to t("admin.common.show"), user_path(user) %></td>
+  <% if current_user.admin? || current_user == user %>
+  <td><%= link_to t("admin.common.edit"), edit_user_path(user) %></td>
   <td>
   <%= button_to user_path(user), method: :delete,
         form: { data: { confirm: t(".confirm_destroy", :login => user.login) }, class: 'button_to destructive' } do %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 9df93815..ad2e0891 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -21,8 +21,18 @@
     <div class="layout_row_content"><%= f.password_field :password_confirmation, :autocomplete => "new-password" %></div>
 
     <% if current_user.admin? %>
-    <div class="layout_row_label"><%= t("users.labels.admin") %></div>
-    <div class="layout_row_content"><%= f.check_box :admin %></div>
+      <div class="layout_row_label"><%= t("users.labels.roles") %></div>
+      <div class="layout_row_content">
+        <% User::ROLES.each do |role| %>
+          <label class="role_choice">
+            <%= check_box_tag "user[roles][]", role, @user.roles.include?(role),
+                  :id => "user_roles_#{role}" %>
+            <%= t("users.roles.#{role}") %>
+            <span class="field_hint"><%= t("users.role_hints.#{role}") %></span>
+          </label>
+        <% end %>
+        <%= hidden_field_tag "user[roles][]", "" %>
+      </div>
     <% end %>
 
     <div class="layout_row_label"></div>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 0a003cb1..854811a2 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,27 +1,32 @@
-<h1><%= t(".admins") %></h1>
-<%= link_to new_user_path(admin: true), class: 'action_button' do %>
-  <%= icon("plus", library: "tabler", "aria-hidden": true) %> <%= t(".create_admin") %>
-<% end %>
-<table class="user_table">
-  <tr class="header">
-    <th><%= t("users.labels.login") %></th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
-  <%= render :partial => "user", :locals => {:users => @users[:admin] ||= []} %>
-</table>
+<h1><%= t(".title") %></h1>
+
+<p class="button_row">
+  <% UsersController::ROLE_PRESETS.each_key do |preset| %>
+    <%= link_to new_user_path(:preset => preset), class: 'action_button' do %>
+      <%= icon("plus", library: "tabler", "aria-hidden": true) %>
+      <%= t(".create_#{preset}") %>
+    <% end %>
+  <% end %>
+</p>
 
-<h1><%= t(".users") %></h1>
-<%= link_to new_user_path, class: 'action_button' do %>
-  <%= icon("plus", library: "tabler", "aria-hidden": true) %> <%= t(".create_user") %>
+<% UsersController::GROUP_ORDER.each do |group| %>
+  <% members = @users[group] || [] %>
+  <h2 class="user_group_heading <%= "user_group_alumni" if group == :alumni %>">
+    <%= t(".group_#{group}") %>
+    <span class="dashboard_widget_meta"><%= members.size %></span>
+  </h2>
+  <% if members.any? %>
+    <table class="user_table <%= "user_table_alumni" if group == :alumni %>">
+      <tr class="header">
+        <th><%= t("users.labels.login") %></th>
+        <th><%= t("users.labels.roles") %></th>
+        <th></th>
+        <th></th>
+        <th></th>
+      </tr>
+      <%= render :partial => "user", :locals => { :users => members } %>
+    </table>
+  <% else %>
+    <p class="field_hint"><%= t(".group_empty") %></p>
+  <% end %>
 <% end %>
-<table class="user_table">
-  <tr class="header">
-    <th><%= t("users.labels.login") %></th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
-  <%= render :partial => "user", :locals => {:users => @users[:user] ||= []} %>
-</table>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 776e6e96..8d99fd92 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -21,8 +21,18 @@
     <div class="layout_row_label"><%= t("users.labels.confirm") %></div>
     <div class="layout_row_content"><%= f.password_field :password_confirmation %></div>
 
-    <div class="layout_row_label"><%= t("users.labels.admin") %></div>
-    <div class="layout_row_content"><%= f.check_box :admin %></div>
+    <div class="layout_row_label"><%= t("users.labels.roles") %></div>
+    <div class="layout_row_content">
+      <% User::ROLES.each do |role| %>
+        <label class="role_choice">
+          <%= check_box_tag "user[roles][]", role, @user.roles.include?(role),
+                :id => "user_roles_#{role}" %>
+          <%= t("users.roles.#{role}") %>
+          <span class="field_hint"><%= t("users.role_hints.#{role}") %></span>
+        </label>
+      <% end %>
+      <%= hidden_field_tag "user[roles][]", "" %>
+    </div>
 
     <div class="layout_row_label"></div>
     <div class="layout_row_content"><%= f.submit t("admin.common.create") %></div>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 44976800..a320e53e 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -19,7 +19,9 @@
     <div class="layout_row_label"><%= t("users.labels.email") %></div>
     <div class="layout_row_content"><%= @user.email %></div>
 
-    <div class="layout_row_label"><%= t("users.labels.admin") %></div>
-    <div class="layout_row_content"><%= @user.admin ? t("admin.common.yes") : t("admin.common.no") %></div>
+    <div class="layout_row_label"><%= t("users.labels.roles") %></div>
+    <div class="layout_row_content">
+      <%= @user.roles.any? ? @user.role_labels.join(", ") : t("users.no_roles") %>
+    </div>
   </div>
 </div>