diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 883976311..72905b1e3 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -1,8 +1,11 @@ class Admin::UsersController < Admin::BaseController load_and_authorize_resource + has_filters %w[active erased], only: :index + def index - @users = User.by_username_email_or_document_number(params[:search]) if params[:search] + @users = @users.send(@current_filter) + @users = @users.by_username_email_or_document_number(params[:search]) if params[:search] @users = @users.page(params[:page]) respond_to do |format| format.html diff --git a/app/views/admin/users/_users.html.erb b/app/views/admin/users/_users.html.erb index f6993470a..5334d1c11 100644 --- a/app/views/admin/users/_users.html.erb +++ b/app/views/admin/users/_users.html.erb @@ -1,24 +1,36 @@ +<%= render "shared/filter_subnav", i18n_namespace: "admin.users.index" %> + <% if @users.any? %>
| <%= t("admin.users.columns.name") %> | -<%= t("admin.users.columns.email") %> | -<%= t("admin.users.columns.document_number") %> | -<%= t("admin.users.columns.roles") %> | -<%= t("admin.users.columns.verification_level") %> | + <% if @current_filter == "erased" %> +<%= t("admin.users.columns.id") %> | +<%= t("admin.users.columns.erase_reason") %> | + <% else %> +<%= t("admin.users.columns.name") %> | +<%= t("admin.users.columns.email") %> | +<%= t("admin.users.columns.document_number") %> | +<%= t("admin.users.columns.roles") %> | +<%= t("admin.users.columns.verification_level") %> | + <% end %>
|---|---|---|---|---|---|---|---|---|---|---|---|
| <%= link_to user.name, user_path(user), target: "_blank" %> | -<%= user.email %> | -<%= user.document_number %> | -<%= display_user_roles(user) %> | -<%= user.user_type %> | + <% if @current_filter == "erased" %> +<%= link_to user.id, user_path(user), target: "_blank" %> | +<%= user.erase_reason %> | + <% else %> +<%= link_to user.name, user_path(user), target: "_blank" %> | +<%= user.email %> | +<%= user.document_number %> | +<%= display_user_roles(user) %> | +<%= user.user_type %> | + <% end %>