From 67942e06190394176acbb83549564f4d923b9c38 Mon Sep 17 00:00:00 2001
From: Amaia Castro <amaia@amaiac.net>
Date: Mon, 29 May 2017 20:17:38 +0200
Subject: [PATCH] Display roles for users

---
 app/helpers/admin_helper.rb           | 16 ++++++++++++++++
 app/views/admin/users/_users.html.erb | 10 ++++++----
 config/locales/admin.en.yml           |  5 ++---
 config/locales/admin.es.yml           |  5 ++---
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index b1eab5265..9fadfea39 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -52,6 +52,22 @@ module AdminHelper
     resource.persisted? ? "edit" : "new"
   end
 
+  def user_roles(user)
+    roles = []
+    roles << :admin if user.administrator?
+    roles << :moderator if user.moderator?
+    roles << :valuator if user.valuator?
+    roles << :manager if user.manager?
+    roles << :poll_officer if user.poll_officer?
+    roles << :official if user.official?
+    roles << :organization if user.organization?
+    roles
+  end
+
+  def display_user_roles(user)
+    user_roles(user).join(", ")
+  end
+
   private
 
     def namespace
diff --git a/app/views/admin/users/_users.html.erb b/app/views/admin/users/_users.html.erb
index 4d1a6db0e..f3c6af0fa 100644
--- a/app/views/admin/users/_users.html.erb
+++ b/app/views/admin/users/_users.html.erb
@@ -3,10 +3,11 @@
   <table>
     <thead>
       <tr>
-        <th><%= t('admin.users.fields.name') %></th>
-        <th><%= t('admin.users.fields.email') %></th>
-        <th><%= t('admin.users.fields.document_number') %></th>
-        <th><%= t('admin.users.fields.verification_level') %></th>
+        <th><%= t('admin.users.columns.name') %></th>
+        <th><%= t('admin.users.columns.email') %></th>
+        <th><%= t('admin.users.columns.document_number') %></th>
+        <th><%= t('admin.users.columns.roles') %></th>
+        <th><%= t('admin.users.columns.verification_level') %></th>
       </tr>
     </thead>
     <% @users.each do |user| %>
@@ -14,6 +15,7 @@
         <td><%= user.name %></td>
         <td><%= user.email %></td>
         <td><%= user.document_number %></td>
+        <td><%= display_user_roles(user) %></td>
         <td><%= user.user_type %></td>
       </tr>
     <% end %>
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index ea55d190d..3385d3178 100755
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -818,15 +818,14 @@ en:
         placeholder: Type the name of the topic
       update: Update Topic
     users:
-      fields:
+      columns:
         name: Name
         email: Email
         document_number: Document number
+        roles: Roles
         verification_level: Verification level
       index:
         title: User
-      user:
-        verify: Verify
       search:
         placeholder: Search user by email, name or document number
         search: Search
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index ba1e375b9..3aefaa20c 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -818,15 +818,14 @@ es:
         placeholder: Escribe el nombre del tema
       update: Actualizar Tema
     users:
-      fields:
+      columns:
         name: Nombre
         email: Correo electrónico
         document_number: DNI/Pasaporte/Tarjeta de residencia
+        roles: Roles
         verification_level: Nivel de verficación
       index:
         title: Usuarios
-      user:
-        verify: Verificar
       search:
         placeholder: Buscar usuario por email, nombre o DNI
         search: Buscar