github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-29 01:31:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3764 from techAPJ/master

Browse Source 
FEATURE: add users to group via email
This commit is contained in:
Arpit Jalan
2015-09-15 12:45:11 +05:30
parent 4758144f6a 607265fc28
commit 38adb6b6fb
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/admin/groups_controller.rb
View File

@ -80,8 +80,10 @@ class Admin::GroupsController < Admin::AdminController
users = User.where(username: params[:usernames].split(",")) users = User.where(username: params[:usernames].split(","))
elsif params[:user_ids].present? elsif params[:user_ids].present?
users = User.find(params[:user_ids].split(",")) users = User.find(params[:user_ids].split(","))
elsif params[:user_emails].present?
users = User.where(email: params[:user_emails].split(","))
else else
raise Discourse::InvalidParameters.new('user_ids or usernames must be present') raise Discourse::InvalidParameters.new('user_ids or usernames or user_emails must be present')
end end
users.each do |user| users.each do |user|