@@ -14,8 +14,7 @@ class Round < ActiveRecord::Base has_many :flights validates_presence_of :name - validates_uniqueness_of :name, :case_sensitive => false, - :message => 'already exists' + validates_uniqueness_of :name, :case_sensitive => false, :message => 'already exists' validates_length_of :name, :maximum => 20, :allow_blank => true validates_presence_of :position @@ -35,10 +34,10 @@ class Round < ActiveRecord::Base end def self.completed?(round_number) - rounds = Round.find(:all, :conditions => [ 'position IN (?)', (1..round_number) ]) rescue nil + rounds = Round.all(:include => :flights, :conditions => [ 'position IN (?)', (1..round_number) ]) rescue nil raise ArgumentException if rounds.nil? rounds.all?{ |round| - round.flights.length > 0 && round.flights.all?{ |flight| flight.completed? } + round.flights.size > 0 && round.flights.all?{ |flight| flight.completed? } } end app/models/round.rb 25df6854a3678ae03abf999c8e69c9a0a9ed4464 David Cato git@crunchyfrog.net http://github.com/davec/openbrewcomp/commit/43f03441d0a4e7851e61350119f9d3e1bc54d187 43f03441d0a4e7851e61350119f9d3e1bc54d187 2009-10-12T14:25:24-07:00 2009-10-09T20:26:12-07:00 Tweak SQL d97c1a9ab2547ec6bb337bcf72d8fb39c656dd2e David Cato git@crunchyfrog.net