Merge remote-tracking branch 'openaustralia_github/no_google_analytics_for_admin_users' into develop

1 files changed, 8 insertions, 3 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index 59f6c971c..4a68d60d1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -246,6 +246,11 @@ class User < ActiveRecord::Base
     # Does the user magically gain powers as if they owned every request?
     # e.g. Can classify it
     def owns_every_request?
+        self.super?
+    end
+
+    # Does this user have extraordinary powers?
+    def super?
         self.admin_level == 'super'
     end
 
@@ -255,18 +260,18 @@ class User < ActiveRecord::Base
 
     # Can the user see every request, even hidden ones?
     def User.view_hidden_requests?(user)
-      !user.nil? && user.admin_level == 'super'
+      !user.nil? && user.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'
+      !user.nil? && user.super?
     end
 
     # Does the user get "(admin)" links on each page on the main site?
     def admin_page_links?
-        self.admin_level == 'super'
+        self.super?
     end
     # Is it public that they are banned?
     def public_banned?