GRN2-268: Fixed redirection after executing an action in Manage Users (…

…bigbluebutton#967) * GRN2-268: Fixed redirection after executing an action in Manage Users * GRN2-268: rubocop fix
poscarasia · Feb 28, 2020 · edcda54 · edcda54
1 parent 50f4d5e
commit edcda54
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/controllers/admins_controller.rb b/app/controllers/admins_controller.rb
@@ -178,7 +178,7 @@ def merge_user
       flash[:success] = I18n.t("administrator.flash.merge_success")
     end
 
-    redirect_to admins_path
+    redirect_back fallback_location: admins_path
   end
 
   # SITE SETTINGS

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -132,12 +132,13 @@ def update
   # DELETE /u/:user_uid
   def destroy
     # Include deleted users in the check
+    admin_path = request.referer.present? ? request.referer : admins_path
     @user = User.include_deleted.find_by(uid: params[:user_uid])
 
     logger.info "Support: #{current_user.email} is deleting #{@user.email}."
 
     self_delete = current_user == @user
-    redirect_url = self_delete ? root_path : admins_path
+    redirect_url = self_delete ? root_path : admin_path
 
     begin
       if current_user && (self_delete || current_user.admin_of?(@user))