[tryton-debian-vcs] tryton-modules-calendar-scheduling branch upstream-3.6 updated. upstream/3.6.2-1-g2c7cf87
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Dec 23 16:51:58 UTC 2015
The following commit has been merged in the upstream-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-calendar-scheduling.git;a=commitdiff;h=upstream/3.6.2-1-g2c7cf87
commit 2c7cf8792fee6773f280f4c86cd6ea926ca0637a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Dec 23 15:10:26 2015 +0100
Adding upstream version 3.6.3.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 9586dd4..e4ec713 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.3 - 2015-12-22
+* Bug fixes (see mercurial logs for details)
+
Version 3.6.2 - 2015-09-19
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index f299a91..f20139b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_calendar_scheduling
-Version: 3.6.2
+Version: 3.6.3
Summary: Tryton module to add scheduling support on CalDAV
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/calendar_.py b/calendar_.py
index 959da95..fea7a2a 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -336,11 +336,11 @@ class Event:
return
actions = iter(args)
+ events_edited = set()
for events, values in zip(actions, actions):
- event_edited = False
for k in values:
if k != 'attendees':
- event_edited = True
+ events_edited.update(events)
break
# store old attendee info
@@ -387,7 +387,7 @@ class Event:
sent_succes = []
sent_fail = []
- if event_edited:
+ if event in events_edited:
if event.status == 'cancelled':
ical.method.value = 'CANCEL'
# send cancel to old attendee
@@ -448,9 +448,11 @@ class Event:
vals = {'status': 'needs-action'}
vals['schedule_status'] = '1.1' # successfully sent
- Attendee.write(sent_succes, vals)
+ if sent_succes:
+ Attendee.write(sent_succes, vals)
vals['schedule_status'] = '5.1' # could not complete delivery
- Attendee.write(sent_fail, vals)
+ if sent_fail:
+ Attendee.write(sent_fail, vals)
@classmethod
def delete(cls, events):
diff --git a/tryton.cfg b/tryton.cfg
index ff37217..7eed393 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.6.2
+version=3.6.3
depends:
calendar
ir
diff --git a/trytond_calendar_scheduling.egg-info/PKG-INFO b/trytond_calendar_scheduling.egg-info/PKG-INFO
index 71fe800..6103197 100644
--- a/trytond_calendar_scheduling.egg-info/PKG-INFO
+++ b/trytond_calendar_scheduling.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-calendar-scheduling
-Version: 3.6.2
+Version: 3.6.3
Summary: Tryton module to add scheduling support on CalDAV
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-calendar-scheduling
More information about the tryton-debian-vcs
mailing list