Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: allow staff members to edit staged users preferences

This commit is contained in:
Régis Hanol 2016-01-15 12:16:00 +01:00
parent 1aa68e085e
commit c9c6b09f36
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/controllers/application_controller.rb
View File

@ -251,8 +251,8 @@ class ApplicationController < ActionController::Base
user = if params[:username] user = if params[:username]
username_lower = params[:username].downcase username_lower = params[:username].downcase
username_lower.gsub!(/\.json$/, '') username_lower.gsub!(/\.json$/, '')
find_opts = {username_lower: username_lower} find_opts = { username_lower: username_lower }
find_opts[:active] = true unless opts[:include_inactive] find_opts[:active] = true unless opts[:include_inactive] || current_user.staff?
User.find_by(find_opts) User.find_by(find_opts)
elsif params[:external_id] elsif params[:external_id]
external_id = params[:external_id].gsub(/\.json$/, '') external_id = params[:external_id].gsub(/\.json$/, '')