Repository :
http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
---------------------------------------------------------------
commit 34c8d46daff330cba61af5ed389770953919475b
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Mon Nov 26 21:33:11 2012 +0100
When retrieving the active regular meeting, we need to restrict them for a given
calendar
---------------------------------------------------------------
fedocal/fedocallib/model.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fedocal/fedocallib/model.py b/fedocal/fedocallib/model.py
index f942ca3..8f6b74a 100644
--- a/fedocal/fedocallib/model.py
+++ b/fedocal/fedocallib/model.py
@@ -277,7 +277,7 @@ class Meeting(BASE):
(Meeting.meeting_date < stop_date)).all()
@classmethod
- def get_active_regular_meeting(cls, session, end_date):
+ def get_active_regular_meeting(cls, session, calendar, end_date):
""" Retrieve the list of meetings with a recursion which
end_date is not past the provided end_date and starting before
the end of the time considered.
@@ -285,6 +285,7 @@ class Meeting(BASE):
meetings = session.query(cls).filter(and_
(Meeting.meeting_date <= end_date),
(Meeting.recursion_ends >= end_date),
+ (Meeting.calendar == calendar),
(Meeting.recursion_frequency != None)
).order_by(Meeting.meeting_date).all()
return meetings