0
@@ -77,6 +77,11 @@ class User < ActiveRecord::Base
0
     token_expires_at && Time.now.utc < token_expires_at 
0
   end
0
 
0
+  # The site admin property is brought in from memberships.admin, when joined with the sites table.
0
+  def site_admin?
0
+    ActiveRecord::ConnectionAdapters::Column.value_to_boolean read_attribute(:site_admin)
0
+  end
0
+
0
   def reset_token!
0
     returning self.token = rand_key do |t|
0
       self.token_expires_at = 2.weeks.from_now.utc

0
@@ -112,6 +112,19 @@ class UserTest < Test::Unit::TestCase
0
     assert_models_equal [users(:quentin)], User.find_admins(:all)
0
   end
0
 
0
+  def test_should_interpret_site_admin
0
+    @user = User.new
0
+    [1, '1', 't', true].each do |value|
0
+      @user.instance_variable_get(:@attributes)['site_admin'] = value
0
+      assert @user.site_admin?, "#{value.inspect} was false"
0
+    end
0
+
0
+    [0, '0', 'f', false, nil].each do |value|
0
+      @user.instance_variable_get(:@attributes)['site_admin'] = value
0
+      assert !@user.site_admin?, "#{value.inspect} was true"
0
+    end
0
+  end
0
+
0
   protected
0
     def create_user(options = {})
0
       User.create({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))