IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Members should be ordered by username.

Browse Source
This commit is contained in:
Guo Xiang Tan
2016-12-08 14:26:50 +08:00
parent ae047c39a4
commit b9b4b0c175
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/groups_controller.rb
View File

@@ -74,24 +74,24 @@ class GroupsController < ApplicationController
limit = (params[:limit] || 20).to_i
offset = params[:offset].to_i
dir = (params[:desc] && !params[:desc].blank?) ? 'DESC' : 'ASC'
order = {}
if params[:order] && %w{last_posted_at last_seen_at}.include?(params[:order])
order.merge!({ params[:order] => params[:asc].blank? ? 'ASC' : 'DESC' })
order.merge!(params[:order] => dir)
end
total = group.users.count
members = group.users
.order('NOT group_users.owner')
.order(order)
.order(:username_lower)
.order(:username_lower => dir)
.limit(limit)
.offset(offset)
owners = group.users
.order(order)
.order(:username_lower)
.order(:username_lower => dir)
.where('group_users.owner')
render json: {