diff --git a/app/controllers/management/users_controller.rb b/app/controllers/management/users_controller.rb index 93172970be76ceb2d287f69c0d855585bcdaef65..8419c88f8c9c85c0801ae385ed8472acca5e4e93 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 6c3ae270445dbfb9fdc8eccf0f04614d1a7cd3c2..36b84376f5417a45f4489edac4009c0509d07052 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 b5924c8af2f0e80331fe44afac9d3191b77a0ac1..84a9c83f678f086a7e874fdda7ff59ebeef4c42e 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>