lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

GRN2-268: Redirecting user back to page they came from in Manage Users (#950)

Browse Source 
* GRN2-268: Redirecting user back to page they come from in Manage Users

* re-factoring
This commit is contained in:
etiennevvv
2020-02-10 16:57:07 -05:00
committed by farhatahmad
parent 68b231dbdb
commit 01c93b1f67
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/users_controller.rb
View File

@ -80,7 +80,14 @@ class UsersController < ApplicationController
# PATCH /u/:user_uid/edit
def update
profile = params[:setting] == "password" ? change_password_path(@user) : edit_user_path(@user)
redirect_path = current_user.admin_of?(@user) ? admins_path : profile
if session[:prev_url].present?
path = session[:prev_url]
session.delete(:prev_url)
else
path = admins_path
end
redirect_path = current_user.admin_of?(@user) ? path : profile
if params[:setting] == "password"
# Update the users password.