Merge pull request #2537 from ligthyear/group-member-management-on-user

Improved Group Member Management on User Administration

app/controllers/admin/users_controller.rb

@@ -17,6 +17,8 @@ class Admin::UsersController < Admin::AdminController
                                     :block,
                                     :unblock,
                                     :trust_level,
+                                    :add_group,
+                                    :remove_group,
                                     :primary_group,
                                     :generate_api_key,
                                     :revoke_api_key]
@@ -101,6 +103,21 @@ class Admin::UsersController < Admin::AdminController
     render_serialized(@user, AdminUserSerializer)
   end
 
+  def add_group
+    group = Group.find(params[:group_id].to_i)
+    return render_json_error group unless group && !group.automatic
+    group.users << @user
+    render nothing: true
+  end
+
+  def remove_group
+    group = Group.find(params[:group_id].to_i)
+    return render_json_error group unless group && !group.automatic
+    group.users.delete(@user)
+    render nothing: true
+  end
+
+
   def primary_group
     guardian.ensure_can_change_primary_group!(@user)
     @user.primary_group_id = params[:primary_group_id]