From 5dd438e8e4fcc96634a5a86837a4a6a09914f081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Vaux?= <fvaux@evolix.fr>
Date: Fri, 23 Jul 2010 18:12:51 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20mauvaises=20dates=20dans=20la=20liste=20?=
 =?UTF-8?q?des=20=C3=A9v=C3=A8nements?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/event.rb           | 10 ++++++++++
 app/views/items/show.html.erb |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/models/event.rb b/app/models/event.rb
index 605f50c..80b2481 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -24,4 +24,14 @@ class Event < ActiveRecord::Base
   def anchor
     'event-%s' % id.to_s(16)
   end
+
+  def bookings_between(lower, upper)
+    bookings_range(lower.at_midnight, 1.day.since(upper).at_midnight - 1)
+  end
+
+  private
+    def bookings_range(lower, upper)
+      self.bookings.find :all,
+        :conditions => ['start_at >= ? AND end_at <= ?', lower, upper]
+    end
 end
diff --git a/app/views/items/show.html.erb b/app/views/items/show.html.erb
index 86184db..e0b09ef 100644
--- a/app/views/items/show.html.erb
+++ b/app/views/items/show.html.erb
@@ -49,7 +49,7 @@
       <ul class="booking-list">
         <%=
           render :partial => 'bookings/booking',
-                 :collection => event.item.bookings_between(@date, upper)
+                 :collection => event.bookings_between(@date, upper)
         %>
       </ul>
       <p class="edit">