make the user edit as login as work

lifewatch-eric · Nov 19, 2024 · 95110d5 · 95110d5
1 parent 3d34755
commit 95110d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -253,12 +253,15 @@ def authorize_and_redirect
   end
 
   def authorize_admin
-    admin = session[:user] && session[:user].admin?
-    redirect_to_home unless admin
+    redirect_to_home unless current_user_admin?
   end
 
   def current_user_admin?
-    session[:user] && session[:user].admin?
+    session[:user]&.admin? || current_login_as_admin?
+  end
+
+  def current_login_as_admin?
+    session[:admin_user]&.admin?
   end
 
   def ontology_restricted?(acronym)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -226,6 +226,7 @@ def unescape_id
 
   def verify_owner
     return if current_user_admin?
+
     if session[:user].nil? || (!session[:user].id.eql?(params[:id]) && !session[:user].username.eql?(params[:id]))
       redirect_to controller: 'login', action: 'index', redirect: "/accounts/#{params[:id]}"
     end