IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-26 21:27:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix all the trailing whitespace

Browse Source
This commit is contained in:
Jakub Arnold
2013-02-07 16:45:24 +01:00
parent 1839614bcc
commit 61654ab8f0
230 changed files with 1165 additions and 1165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/users_controller.rb
+3 -3
View File
@@ -3,10 +3,10 @@ class Admin::UsersController < Admin::AdminController
def index
# Sort order
if params[:query] == "active"
@users = User.order("COALESCE(last_seen_at, '01-01-1970') DESC, username")
@users = User.order("COALESCE(last_seen_at, '01-01-1970') DESC, username")
else
@users = User.order("created_at DESC, username")
end
end
@users = @users.where('approved = false') if params[:query] == 'pending'
@users = @users.where('username_lower like :filter or email like :filter', filter: "%#{params[:filter]}%") if params[:filter].present?
@@ -60,7 +60,7 @@ class Admin::UsersController < Admin::AdminController
@user = User.where(id: params[:user_id]).first
guardian.ensure_can_grant_admin!(@user)
@user.update_column(:admin, true)
render_serialized(@user, AdminUserSerializer)
render_serialized(@user, AdminUserSerializer)
end
def approve