From 0c7e8a742cf70e6587a918622d96f72b40b3950d Mon Sep 17 00:00:00 2001
From: Alexandre Arias <apa13@inf.ufpr.br>
Date: Fri, 13 Nov 2015 12:01:21 -0200
Subject: [PATCH] fix curators and admins management

Signed-off-by: Alexandre Arias <apa13@inf.ufpr.br>
---
 app/controllers/management/users_controller.rb | 17 +++++++++++++++++
 app/views/management/users/admins.html.erb     | 10 +++-------
 app/views/management/users/curators.html.erb   | 10 +++-------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/app/controllers/management/users_controller.rb b/app/controllers/management/users_controller.rb
index 93172970..8419c88f 100644
--- a/app/controllers/management/users_controller.rb
+++ b/app/controllers/management/users_controller.rb
@@ -71,6 +71,23 @@ class Management::UsersController < ManagementController
     end
   end
 
+
+  def curators
+    @curators = Array.new
+    @users = User.includes(:roles).all
+    @users.all.each do |user|
+     @curators << user if user.roles[0].name == "curator"
+    end
+  end
+
+  def admins
+    @admins = Array.new
+    @users = User.includes(:roles).all
+    @users.all.each do |user|
+      @admins << user if user.roles[0].name == "admin"
+    end
+  end
+
   private
 
   # Use callbacks to share common setup or constraints between actions.
diff --git a/app/views/management/users/admins.html.erb b/app/views/management/users/admins.html.erb
index 6c3ae270..36b84376 100644
--- a/app/views/management/users/admins.html.erb
+++ b/app/views/management/users/admins.html.erb
@@ -4,12 +4,8 @@
   novo</a>
 
 
-<% admins = Array.new %>
-<% @users = User.includes(:roles).all%>
-<% @users.all.each do |user|%>
-  <% admins << user if user.roles[0].name == "admin" %>
-<% end %>
-<% if admins[0].nil? %>
+
+<% if @admins.empty? %>
   <BR><BR><h3>Não há adminstradores cadastrados</h3>
 <% else %>
 
@@ -51,7 +47,7 @@
   </thead>
   <tbody>
 
-    <% admins.each do |c| %>
+    <% @admins.each do |c| %>
         <tr>
           <td>
             <a href="#"><%= c.name %></a>
diff --git a/app/views/management/users/curators.html.erb b/app/views/management/users/curators.html.erb
index b5924c8a..84a9c83f 100644
--- a/app/views/management/users/curators.html.erb
+++ b/app/views/management/users/curators.html.erb
@@ -4,12 +4,8 @@
   novo</a>
 
 
-<% curators = Array.new %>
-<% @users = User.includes(:roles).all%>
-<% @users.all.each do |user|%>
-  <% curators << user if user.roles[0].name == "curator" %>
-<% end %>
-<% if curators[0].nil? %>
+
+<% if @curators.empty? %>
   <BR><BR><h3>Não há curadores cadastrados</h3>
 <% else %>
 
@@ -51,7 +47,7 @@
   </thead>
   <tbody>
 
-    <% curators.each do |c| %>
+    <% @curators.each do |c| %>
         <tr>
           <td>
             <a href="#"><%= c.name %></a>
-- 
GitLab