github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 15:28:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3375 from techAPJ/patch-2

Browse Source 
FEATURE: invite existing users to private topic
This commit is contained in:
Robin Ward
2015-04-16 11:13:42 -04:00
parent 94fea09416 d491d4f997
commit 2459f52c71
9 changed files with 74 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/users_controller.rb
View File

@ -446,8 +446,9 @@ class UsersController < ApplicationController
term = params[:term].to_s.strip
topic_id = params[:topic_id]
topic_id = topic_id.to_i if topic_id
topic_allowed_users = params[:topic_allowed_users] || false
results = UserSearch.new(term, topic_id: topic_id, searching_user: current_user).search
results = UserSearch.new(term, topic_id: topic_id, topic_allowed_users: topic_allowed_users, searching_user: current_user).search
user_fields = [:username, :upload_avatar_template, :uploaded_avatar_id]
user_fields << :name if SiteSetting.enable_names?