app/models/basket.rb in enju_library-0.1.0.pre33 vs app/models/basket.rb in enju_library-0.1.0.pre34

- old
+ new

@@ -1,15 +1,15 @@ class Basket < ActiveRecord::Base attr_accessible :note, :user_number - default_scope :order => 'baskets.id DESC' + default_scope order: 'baskets.id DESC' scope :will_expire, lambda {|date| {:conditions => ['created_at < ?', date]}} - belongs_to :user, :validate => true + belongs_to :user, validate: true has_many :accepts - validates_associated :user, :on => :create + validates_associated :user, on: :create # 貸出完了後にかごのユーザidは破棄する - validates_presence_of :user, :on => :create + validates_presence_of :user, on: :create validate :check_suspended attr_accessor :user_number def check_suspended @@ -24,11 +24,11 @@ Basket.will_expire(Time.zone.now.beginning_of_day).destroy_all logger.info "#{Time.zone.now} baskets expired!" end if defined?(EnjuCirculation) - has_many :checked_items, :dependent => :destroy - has_many :items, :through => :checked_items + has_many :checked_items, dependent: :destroy + has_many :items, through: :checked_items has_many :checkouts has_many :checkins def basket_checkout(librarian) return nil if checked_items.size == 0