more complete admin check

scientist-softserv · Aug 10, 2023 · e8fe6b4 · e8fe6b4
1 parent dec1557
commit e8fe6b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -37,7 +37,7 @@ def to_s
   end
 
   def is_admin
-    has_role? :admin
+    has_role? :admin || has_role? :admin, Site.instance
   end
 
   def is_superadmin

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -134,6 +134,9 @@ services:
 
   web:
     <<: *app
+    # Uncomment command to access container with out starting Rails. Useful for debugging
+    # command: sleep infinity
+    # command: sh -l -c "bundle && bundle exec rails s -b 0.0.0.0"
     environment:
       - VIRTUAL_PORT=3000
       - VIRTUAL_HOST=.hyku.test