Merge remote-tracking branch 'openstreetmap/pull/1350'

[rails.git] / app / models / user_block.rb

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index d8fa95cb2319f2aeb7d31a9995641ca1a8496231..de14dcaa9617f351941b93925cc7b1453ee6357b 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -10,20 +10,20 @@ class UserBlock < ActiveRecord::Base
   ##
   # scope to match active blocks
   def self.active
   ##
   # scope to match active blocks
   def self.active

-    self.where("needs_view or ends_at > ?", Time.now.getutc)
+    where("needs_view or ends_at > ?", Time.now.getutc)

   end
 
   ##
   # return a renderable version of the reason text.
   def reason
   end
 
   ##
   # return a renderable version of the reason text.
   def reason

-    RichText.new(read_attribute(:reason_format), read_attribute(:reason))
+    RichText.new(self[:reason_format], self[:reason])

   end
 
   ##
   # returns true if the block is currently active (i.e: the user can't
   # use the API).
   def active?
   end
 
   ##
   # returns true if the block is currently active (i.e: the user can't
   # use the API).
   def active?

-    needs_view or ends_at > Time.now.getutc
+    needs_view || ends_at > Time.now.getutc

   end
 
   ##
   end
 
   ##


@@ -31,20 +31,20 @@ class UserBlock < ActiveRecord::Base
   # is the user object who is revoking the ban.
   def revoke!(revoker)
     update_attributes(
   # is the user object who is revoking the ban.
   def revoke!(revoker)
     update_attributes(

-      :ends_at => Time.now.getutc(),
+      :ends_at => Time.now.getutc,

       :revoker_id => revoker.id,
       :needs_view => false
     )
   end
 
       :revoker_id => revoker.id,
       :needs_view => false
     )
   end
 

-private
+  private

 
   ##
   # validate that only moderators are allowed to change the
   # block. this should be caught and dealt with in the controller,
   # but i've also included it here just in case.
   def moderator_permissions
 
   ##
   # validate that only moderators are allowed to change the
   # block. this should be caught and dealt with in the controller,
   # but i've also included it here just in case.
   def moderator_permissions

-    errors.add(:base, I18n.t('user_block.model.non_moderator_update')) if creator_id_changed? and !creator.moderator?
-    errors.add(:base, I18n.t('user_block.model.non_moderator_revoke')) unless revoker_id.nil? or revoker.moderator?
+    errors.add(:base, I18n.t("user_block.model.non_moderator_update")) if creator_id_changed? && !creator.moderator?
+    errors.add(:base, I18n.t("user_block.model.non_moderator_revoke")) unless revoker_id.nil? || revoker.moderator?

   end
 end
   end
 end