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

Merge pull request #3234 from fullfatthings/add_remove_group_members_by_id_or_name

Browse Source 
Allow adding and removing members of groups by username or id
This commit is contained in:
Régis Hanol
2015-02-25 17:30:25 +01:00
parent 8c5d8715cd 1c545d4c1e
commit cf00e73ed8
2 changed files with 69 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,14 +70,19 @@ class Admin::GroupsController < Admin::AdminController
def add_members
group = Group.find(params.require(:id))
usernames = params.require(:usernames)
return can_not_modify_automatic if group.automatic
usernames.split(",").each do |username|
if user = User.find_by_username(username)
group.add(user)
end
if params[:usernames].present?
users = User.where(username: params[:usernames].split(","))
elsif params[:user_ids].present?
users = User.find(params[:user_ids].split(","))
else
raise Discourse::InvalidParameters.new('user_ids or usernames must be present')
end
users.each do |user|
group.add(user)
end
if group.save
@ -89,14 +94,20 @@ class Admin::GroupsController < Admin::AdminController
def remove_member
group = Group.find(params.require(:id))
user_id = params.require(:user_id).to_i
return can_not_modify_automatic if group.automatic
user = User.find(user_id)
if params[:user_id].present?
user = User.find(params[:user_id])
elsif params[:username].present?
user = User.find_by_username(params[:username])
else
raise Discourse::InvalidParameters.new('user_id or username must be present')
end
user.primary_group_id = nil if user.primary_group_id == group.id
group.users.delete(user_id)
group.users.delete(user.id)
if group.save && user.save
render json: success_json