From 0d90144c0e771f8159d33bf1784e0a12ab46b373 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Tue, 20 Jan 2009 15:57:24 -0800 Subject: [PATCH] Fixed a bug where Rates on a project were being selected by the default rate finder. #1921 --- app/models/rate.rb | 2 +- spec/models/rate_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/rate.rb b/app/models/rate.rb index 07014ee..72af41f 100644 --- a/app/models/rate.rb +++ b/app/models/rate.rb @@ -62,7 +62,7 @@ class Rate < ActiveRecord::Base return Rate.find(:first, :order => 'date_in_effect DESC', :conditions => [ - "user_id IN (?) AND date_in_effect <= ?", + "user_id IN (?) AND date_in_effect <= ? AND project_id IS NULL", user.id, date ]) diff --git a/spec/models/rate_spec.rb b/spec/models/rate_spec.rb index b6456fe..570b050 100644 --- a/spec/models/rate_spec.rb +++ b/spec/models/rate_spec.rb @@ -287,7 +287,7 @@ describe Rate, 'for_user_project_and_date (private)' do it 'should search rates without a project when +project+ is nil' do Rate.should_receive(:find).with(:first, { - :conditions => ["user_id IN (?) AND date_in_effect <= ?", + :conditions => ["user_id IN (?) AND date_in_effect <= ? AND project_id IS NULL", @user.id, @date ],