Repository :
http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
---------------------------------------------------------------
commit 66e5cb922e78ecbfa90468d9a070867f3a9c889f
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Mon Dec 3 21:56:32 2012 +0100
Fix new meeting date when editing recursive meeting
The new meeting should refer to the date in the form not the date of the original
meeting as the original meeting is the begining date of the
recursion while the date in the form can be the date from which the
recursion changes.
---------------------------------------------------------------
fedocal/fedocallib/__init__.py | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/fedocal/fedocallib/__init__.py b/fedocal/fedocallib/__init__.py
index 4b78d61..6028606 100644
--- a/fedocal/fedocallib/__init__.py
+++ b/fedocal/fedocallib/__init__.py
@@ -751,7 +751,7 @@ def edit_meeting(session, meeting, calendarobj, fas_user,
if not edit_all_meeting:
remove_recursion = True
new_meeting = Meeting.copy(meeting)
- new_meeting.meeting_date = meeting.meeting_date + timedelta(
+ new_meeting.meeting_date = meeting_date + timedelta(
days=meeting.recursion_frequency)
free_time = agenda_is_free(session, calendarobj,
new_meeting.meeting_date,
@@ -762,7 +762,6 @@ def edit_meeting(session, meeting, calendarobj, fas_user,
bool(free_time):
new_meeting.save(session)
-
meeting_time_start = convert_time(
datetime(meeting_date.year, meeting_date.month, meeting_date.day,
meeting_time_start.hour,