aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2012-02-06 14:48:12 +0000
committerRobin Houston <robin.houston@gmail.com>2012-02-06 14:48:12 +0000
commit3b6e5a692b852a88f55b21a7210f60a6f7cfc24b (patch)
tree02ec8e10de4f025eb430cd3856fe46381013c08a /app/models/user.rb
parent11782f45795dc8f57e5ca9666e8325976541120e (diff)
Let admin users use auto-login URLs
Don't change logged-in user from an admin when visiting a auto-login URL. Closes #306.
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 28d130c46..691a59e48 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -264,6 +264,12 @@ class User < ActiveRecord::Base
def User.view_hidden_requests?(user)
!user.nil? && user.admin_level == 'super'
end
+
+ # Should the user be kept logged into their own account
+ # if they follow a /c/ redirect link belonging to another user?
+ def User.stay_logged_in_on_redirect?(user)
+ !user.nil? && user.admin_level == 'super'
+ end
# Does the user get "(admin)" links on each page on the main site?
def admin_page_links?