feat: Use order_by_name as default sort order for inbox/user (#1160)

This commit is contained in:
Pranav Raj S
2020-08-22 22:20:22 +05:30
committed by GitHub
parent 5917cd5d98
commit ec6cd4bbba
4 changed files with 5 additions and 3 deletions

View File

@@ -64,6 +64,6 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
end
def agents
@agents ||= Current.account.users
@agents ||= Current.account.users.order_by_full_name
end
end

View File

@@ -4,7 +4,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
before_action :check_authorization
def index
@inboxes = policy_scope(Current.account.inboxes.order_by_id.includes(:channel, :avatar_attachment))
@inboxes = policy_scope(Current.account.inboxes.order_by_name.includes(:channel, :avatar_attachment))
end
def create

View File

@@ -46,7 +46,7 @@ class Inbox < ApplicationRecord
after_destroy :delete_round_robin_agents
scope :order_by_id, -> { order(id: :asc) }
scope :order_by_name, -> { order('lower(name) ASC') }
def add_member(user_id)
member = inbox_members.new(user_id: user_id)

View File

@@ -81,6 +81,8 @@ class User < ApplicationRecord
after_create :create_access_token
after_save :update_presence_in_redis, if: :saved_change_to_availability?
scope :order_by_full_name, -> { order('lower(name) ASC') }
def send_devise_notification(notification, *args)
devise_mailer.send(notification, self, *args).deliver_later
end