diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ee0af5f60..4077113dc 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2,11 +2,11 @@ class UsersController < ApplicationController before_filter :authenticate_user! def index - search_and_load_members current_organization.members.active + search_and_load_members current_organization.members.active, {s: 'member_uid asc'} end def manage - search_and_load_members current_organization.members + search_and_load_members current_organization.members, {s: 'member_uid asc'} end def show @@ -57,8 +57,8 @@ def update private - def search_and_load_members(members_scope) - @search = members_scope.ransack(search_params) + def search_and_load_members(members_scope, default_search_params) + @search = members_scope.ransack(default_search_params.merge(params.fetch(:q, {}))) @members = @search.result.eager_load(:account, :user).page(params[:page]).per(20) @@ -67,10 +67,6 @@ def search_and_load_members(members_scope) @members.map { |m| MemberDecorator.new(m, self.class.helpers) } end - def search_params - {s: 'member_uid asc'}.merge(params.fetch(:q, {})) - end - def scoped_users current_organization.users end diff --git a/app/views/users/_member_card.html.erb b/app/views/users/_member_card.html.erb index c6ed0c62c..0b61420b3 100644 --- a/app/views/users/_member_card.html.erb +++ b/app/views/users/_member_card.html.erb @@ -16,17 +16,21 @@