L.hash expects parseHash to return false if there isn't a location

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

diff --git a/app/models/oauth_token.rb b/app/models/oauth_token.rb
index c9595e870f9f743ef315ceb47b214b24545116c0..0fe0bea301eebfdc5c4da325c28ec9f214ecc463 100644 (file)
--- a/app/models/oauth_token.rb
+++ b/app/models/oauth_token.rb
@@ -2,7 +2,7 @@ class OauthToken < ActiveRecord::Base
   belongs_to :client_application
   belongs_to :user
 
   belongs_to :client_application
   belongs_to :user
 

-  scope :authorized, where("authorized_at IS NOT NULL and invalidated_at IS NULL")
+  scope :authorized, -> { where("authorized_at IS NOT NULL and invalidated_at IS NULL") }

 
   validates_uniqueness_of :token
   validates_presence_of :client_application, :token
 
   validates_uniqueness_of :token
   validates_presence_of :client_application, :token


@@ -14,9 +14,7 @@ class OauthToken < ActiveRecord::Base
   end
   
   def invalidate!
   end
   
   def invalidate!

-    update_attributes({
-      :invalidated_at => Time.now
-    }, :without_protection => true)
+    update_attributes(:invalidated_at => Time.now)

   end
   
   def authorized?
   end
   
   def authorized?