fix: mauvaises dates dans la liste des évènements
This commit is contained in:
parent
2f344a5f7d
commit
5dd438e8e4
|
@ -24,4 +24,14 @@ class Event < ActiveRecord::Base
|
||||||
def anchor
|
def anchor
|
||||||
'event-%s' % id.to_s(16)
|
'event-%s' % id.to_s(16)
|
||||||
end
|
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
|
end
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
<ul class="booking-list">
|
<ul class="booking-list">
|
||||||
<%=
|
<%=
|
||||||
render :partial => 'bookings/booking',
|
render :partial => 'bookings/booking',
|
||||||
:collection => event.item.bookings_between(@date, upper)
|
:collection => event.bookings_between(@date, upper)
|
||||||
%>
|
%>
|
||||||
</ul>
|
</ul>
|
||||||
<p class="edit">
|
<p class="edit">
|
||||||
|
|
Reference in New Issue