From 17f4e58e46b42e2b21704ff3293388ea9c11c77d Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 2 Sep 2010 22:53:01 +0100 Subject: [PATCH] Use before_validation with :on rather than before_validation_on_xxx --- app/models/client_application.rb | 2 +- app/models/oauth_token.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/client_application.rb b/app/models/client_application.rb index ffca1c63c..c69502a0b 100644 --- a/app/models/client_application.rb +++ b/app/models/client_application.rb @@ -5,7 +5,7 @@ class ClientApplication < ActiveRecord::Base has_many :access_tokens validates_presence_of :name, :url, :key, :secret validates_uniqueness_of :key - before_validation_on_create :generate_keys + before_validation :generate_keys, :on => :create validates_format_of :url, :with => /\Ahttp(s?):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/i validates_format_of :support_url, :with => /\Ahttp(s?):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/i, :allow_blank=>true diff --git a/app/models/oauth_token.rb b/app/models/oauth_token.rb index f64ec53db..c45a3d569 100644 --- a/app/models/oauth_token.rb +++ b/app/models/oauth_token.rb @@ -3,7 +3,7 @@ class OauthToken < ActiveRecord::Base belongs_to :user validates_uniqueness_of :token validates_presence_of :client_application, :token, :secret - before_validation_on_create :generate_keys + before_validation :generate_keys, :on => :create def self.find_token(token_key) token = OauthToken.find_by_token(token_key, :include => :client_application) -- 2.43.2