From 9885ae61fb9b142fae5d46a601dae74814a11c5d Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 13 Jul 2020 10:44:11 -0500 Subject: [PATCH] user name changes: add search options. --- app/controllers/user_name_change_requests_controller.rb | 2 +- app/models/user_name_change_request.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/user_name_change_requests_controller.rb b/app/controllers/user_name_change_requests_controller.rb index e93278492..2dfc96b2e 100644 --- a/app/controllers/user_name_change_requests_controller.rb +++ b/app/controllers/user_name_change_requests_controller.rb @@ -19,7 +19,7 @@ class UserNameChangeRequestsController < ApplicationController end def index - @change_requests = authorize UserNameChangeRequest.visible(CurrentUser.user).order("id desc").paginate(params[:page], :limit => params[:limit]) + @change_requests = authorize UserNameChangeRequest.visible(CurrentUser.user).paginated_search(params) respond_with(@change_requests) end end diff --git a/app/models/user_name_change_request.rb b/app/models/user_name_change_request.rb index e80adcc82..2cdafe5a6 100644 --- a/app/models/user_name_change_request.rb +++ b/app/models/user_name_change_request.rb @@ -18,6 +18,12 @@ class UserNameChangeRequest < ApplicationRecord end end + def self.search(params) + q = super + q = q.search_attributes(params, :user, :original_name, :desired_name) + q.apply_default_order(params) + end + def update_name! user.update!(name: desired_name) end