Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added order for User.of_role().

Browse source
This commit is contained in:
Martin Edenhofer 2016-04-26 01:41:38 +02:00
parent d31daac4ef
commit 2cb31d20a7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/user.rb
View file

@ -460,12 +460,12 @@ returns
def self.of_role(role, group_ids = nil) def self.of_role(role, group_ids = nil)
roles_ids = Role.where(active: true, name: role).map(&:id) roles_ids = Role.where(active: true, name: role).map(&:id)
if !group_ids if !group_ids
return User.where(active: true).joins(:users_roles).where('roles_users.role_id IN (?)', roles_ids) return User.where(active: true).joins(:users_roles).where('roles_users.role_id IN (?)', roles_ids).order('users.updated_at DESC')
end end
User.where(active: true) User.where(active: true)
.joins(:users_roles) .joins(:users_roles)
.joins(:users_groups) .joins(:users_groups)
.where('roles_users.role_id IN (?) AND users_groups.group_ids IN (?)', roles_ids, group_ids) .where('roles_users.role_id IN (?) AND users_groups.group_ids IN (?)', roles_ids, group_ids).order('users.updated_at DESC')
end end
=begin =begin