github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 01:47:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

correct bad merge

Browse Source
This commit is contained in:
Sam 2015-11-30 17:12:51 +11:00
parent ad3dd161e7
commit f6390c8ad6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/users_controller.rb
View File

@ -205,10 +205,13 @@ class UsersController < ApplicationController
usernames = [params[:username]] if usernames.blank?
usernames.each(&:downcase!)
groups = Group.where(name: users).pluck(:name)
users -= groups
groups = Group.where(name: usernames).pluck(:name)
usernames -= groups
result = User.where(staged: false)
.where(username_lower: usernames)
.pluck(:username_lower)
result = User.where(staged: false).where(username_lower: users).pluck(:username_lower)
render json: {valid: result, valid_groups: groups}
end