Repository :
http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
---------------------------------------------------------------
commit 37e1c34d4fe56d45e4b92f9ce960179b7f2a2766
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Wed Nov 28 13:21:54 2012 +0100
Add the meeting_date_end to the edit meeting
Even if we don't do anything with the meeting_date_end atm from a user
pov, we have the code ready.
---------------------------------------------------------------
fedocal/__init__.py | 2 +-
fedocal/fedocallib/__init__.py | 14 +++++++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/fedocal/__init__.py b/fedocal/__init__.py
index 4b8c94f..838cdf6 100644
--- a/fedocal/__init__.py
+++ b/fedocal/__init__.py
@@ -368,7 +368,7 @@ def edit_meeting(meeting_id):
fas_user=flask.g.fas_user,
meeting_name=form.meeting_name.data,
meeting_date=form.meeting_date.data,
- # meeting_date_end,
+ meeting_date_end=None,
meeting_time_start=form.meeting_time_start.data,
meeting_time_stop=form.meeting_time_stop.data,
comanager=form.comanager.data,
diff --git a/fedocal/fedocallib/__init__.py b/fedocal/fedocallib/__init__.py
index c3c5924..2fb43ff 100644
--- a/fedocal/fedocallib/__init__.py
+++ b/fedocal/fedocallib/__init__.py
@@ -670,7 +670,7 @@ def add_meeting(session, calendarobj, fas_user,
def edit_meeting(session, meeting, calendarobj, fas_user,
- meeting_name, meeting_date, # meeting_date_end,
+ meeting_name, meeting_date, meeting_date_end,
meeting_time_start, meeting_time_stop, comanager,
meeting_information,
meeting_region, tzone,
@@ -693,8 +693,16 @@ def edit_meeting(session, meeting, calendarobj, fas_user,
raise InvalidMeeting(
'The start time of your meeting is later than the stop time.')
+ if not meeting_date_end:
+ meeting_date_end = meeting_date
+
+ if meeting_date > meeting_date_end:
+ raise InvalidMeeting(
+ 'The start date of your meeting is later than the end date.')
+
meeting_time_start = convert_time(
- datetime(meeting_date.year, meeting_date.month, meeting_date.day,
+ datetime(meeting_date_end.year, meeting_date_end.month,
+ meeting_date_end.day,
meeting_time_start.hour,
meeting_time_start.minute),
tzone, 'UTC')
@@ -711,7 +719,7 @@ def edit_meeting(session, meeting, calendarobj, fas_user,
comanager)
meeting.meeting_date = meeting_time_start.date()
- meeting_end_date = None # meeting_date_end
+ meeting_end_date = meeting_time_stop.date()
if not meeting_end_date:
meeting_end_date = meeting_time_start.date()
meeting.meeting_end_date = meeting_end_date