diff --git a/app/controllers/admin/valuator_groups_controller.rb b/app/controllers/admin/valuator_groups_controller.rb index 876900ac1..327e820a1 100644 --- a/app/controllers/admin/valuator_groups_controller.rb +++ b/app/controllers/admin/valuator_groups_controller.rb @@ -1,7 +1,7 @@ class Admin::ValuatorGroupsController < Admin::BaseController def index - @groups = ValuatorGroup.all + @groups = ValuatorGroup.all.page(params[:page]) end def show diff --git a/app/views/admin/valuator_groups/index.html.erb b/app/views/admin/valuator_groups/index.html.erb index 358fa0bc1..eada85e25 100644 --- a/app/views/admin/valuator_groups/index.html.erb +++ b/app/views/admin/valuator_groups/index.html.erb @@ -3,7 +3,7 @@ <%= link_to t("admin.valuator_groups.index.new"), new_admin_valuator_group_path, class: "button float-right" %> <% if @groups.any? %> -

There are <%= @groups.count %> groups of users

+

<%= page_entries_info @groups %>

@@ -16,6 +16,7 @@
+ <%= paginate @groups %> <% else %>
<%= t("admin.valuator_groups.index.no_groups") %> diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 765f92932..2d5163cb0 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -32,8 +32,11 @@ en: one: "Administrator" other: "Administrators" valuator: - one: "Evaluador" - other: "Evaluadores" + one: "Valuator" + other: "Valuators" + valuator_group: + one: "Valuator group" + other: "Valuator groups" manager: one: "Manager" other: "Managers" diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index 9e195bd25..d3a0c776a 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -34,6 +34,9 @@ es: valuator: one: "Evaluador" other: "Evaluadores" + valuator_group: + one: "Grupo de Evaluadores" + other: "Grupos de Evaluadores" manager: one: "Gestor" other: "Gestores"