[tryton-debian-vcs] tryton-modules-calendar branch debian-jessie-3.4 updated. debian/3.4.1-1-4-g23f7fa0
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Jul 15 14:20:15 UTC 2015
The following commit has been merged in the debian-jessie-3.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-calendar.git;a=commitdiff;h=debian/3.4.1-1-4-g23f7fa0
commit 23f7fa0ac7f411d09014e7ca104e6c8f29353e96
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 15 12:45:52 2015 +0200
Releasing debian version 3.4.3-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 9977996..da090f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-calendar (3.4.3-1) unstable; urgency=medium
+
+ * Wrapping and sorting control files (wrap-and-sort -bts).
+ * Setting the branch in the watch file to the fixed version 3.4.
+ * Merging upstream version 3.4.3.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 15 Jul 2015 12:45:52 +0200
+
tryton-modules-calendar (3.4.1-1) unstable; urgency=medium
* Adding actual upstream signing key.
commit b81069ae186df5979acc358c374b2bc3d463aad5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 15 12:45:51 2015 +0200
Merging upstream version 3.4.3.
diff --git a/CHANGELOG b/CHANGELOG
index 47f7057..7f51f47 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+Version 3.4.3 - 2015-07-13
+* Bug fixes (see mercurial logs for details)
+
+Version 3.4.2 - 2015-05-22
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.1 - 2015-03-01
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 0513922..0bf2039 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_calendar
-Version: 3.4.1
+Version: 3.4.3
Summary: Tryton module for CalDAV
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/caldav.py b/caldav.py
index a5fd3b1..e32813a 100644
--- a/caldav.py
+++ b/caldav.py
@@ -298,7 +298,7 @@ def do_POST(self):
except DAV_Error, exception:
ec, _ = exception
return self.send_status(ec)
- self.send_body_chunks(DATA, '200', 'OK', 'OK')
+ self.send_body(DATA, 200, 'OK', 'OK')
return
return _prev_do_POST(self)
diff --git a/calendar_.py b/calendar_.py
index 68a25c2..3210a3e 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -121,24 +121,6 @@ class Calendar(ModelSQL, ModelView):
ical.vevent_list.extend(ical2.vevent_list)
return ical
- @property
- def _fbtype(self):
- '''
- Return the freebusy type for give transparent and status
- '''
- if self.transp == 'opaque':
- if not self.status or self.status == 'confirmed':
- fbtype = 'BUSY'
- elif self.status == 'cancelled':
- fbtype = 'FREE'
- elif self.status == 'tentative':
- fbtype = 'BUSY-TENTATIVE'
- else:
- fbtype = 'BUSY'
- else:
- fbtype = 'FREE'
- return fbtype
-
@classmethod
def freebusy(cls, calendar_id, dtstart, dtend):
'''
@@ -163,7 +145,7 @@ class Calendar(ModelSQL, ModelView):
else:
ical.vfreebusy.add('dtend').value = dtend.astimezone(tzutc)
- with Transaction().set_context(_check_access=False):
+ with Transaction().set_user(0):
events = Event.search([
['OR',
[('dtstart', '<=', dtstart),
@@ -200,7 +182,7 @@ class Calendar(ModelSQL, ModelView):
freebusy_dtstart.astimezone(tzutc),
freebusy_dtend.astimezone(tzutc))]
- with Transaction().set_context(_check_access=False):
+ with Transaction().set_user(0):
events = Event.search([
('parent', '=', None),
('dtstart', '<=', dtend),
@@ -320,7 +302,7 @@ class Calendar(ModelSQL, ModelView):
email = attendee.value
if attendee.value.lower().startswith('mailto:'):
email = attendee.value[7:]
- with Transaction().set_context(_check_access=False):
+ with Transaction().set_user(0):
calendars = cls.search([
('owner.email', '=', email),
])
@@ -497,13 +479,14 @@ class Event(ModelSQL, ModelView):
# Migrate from 1.4: remove classification_public
ModelData = Pool().get('ir.model.data')
Rule = Pool().get('ir.rule')
- models_data = ModelData.search([
- ('fs_id', '=', 'rule_group_read_calendar_line3'),
- ('module', '=', module_name),
- ], limit=1)
- if models_data:
- model_data, = models_data
- Rule.delete([Rule(model_data.db_id)])
+ with Transaction().set_user(0):
+ models_data = ModelData.search([
+ ('fs_id', '=', 'rule_group_read_calendar_line3'),
+ ('module', '=', module_name),
+ ], limit=1)
+ if models_data:
+ model_data, = models_data
+ Rule.delete([Rule(model_data.db_id)])
return super(Event, cls).__register__(module_name)
@staticmethod
@@ -539,6 +522,24 @@ class Event(ModelSQL, ModelView):
def search_calendar_field(cls, name, clause):
return [('calendar.' + name[9:],) + tuple(clause[1:])]
+ @property
+ def _fbtype(self):
+ '''
+ Return the freebusy type for give transparent and status
+ '''
+ if self.transp == 'opaque':
+ if not self.status or self.status == 'confirmed':
+ fbtype = 'BUSY'
+ elif self.status == 'cancelled':
+ fbtype = 'FREE'
+ elif self.status == 'tentative':
+ fbtype = 'BUSY-TENTATIVE'
+ else:
+ fbtype = 'BUSY'
+ else:
+ fbtype = 'FREE'
+ return fbtype
+
@classmethod
def validate(cls, events):
super(Event, cls).validate(events)
@@ -579,7 +580,7 @@ class Event(ModelSQL, ModelView):
if x.status != 'declined'
and x.email != event.parent.organizer]
if attendee_emails:
- with Transaction().set_context(_check_access=False):
+ with Transaction().set_user(0):
calendars = Calendar.search([
('owner.email', 'in', attendee_emails),
])
@@ -682,7 +683,7 @@ class Event(ModelSQL, ModelView):
for x in event.parent.attendees
if x.status != 'declined'
and x.email != event.parent.organizer]
- with Transaction().set_context(_check_access=False):
+ with Transaction().set_user(0):
events2 = cls.search([
('uuid', '=', event.uuid),
('id', '!=', event.id),
@@ -698,7 +699,7 @@ class Event(ModelSQL, ModelView):
if events2:
cls.write(events2, event._event2update())
if attendee_emails:
- with Transaction().set_context(_check_access=False):
+ with Transaction().set_user(0):
calendars = Calendar.search([
('owner.email', 'in', attendee_emails),
])
@@ -764,7 +765,7 @@ class Event(ModelSQL, ModelView):
attendee_emails = [x.email for x in event.parent.attendees
if x.email != event.parent.organizer]
if attendee_emails:
- with Transaction().set_context(_check_access=False):
+ with Transaction().set_user(0):
cls.delete(cls.search([
('uuid', '=', event.uuid),
('calendar.owner.email', 'in',
@@ -778,7 +779,7 @@ class Event(ModelSQL, ModelView):
organizer = event.organizer
else:
organizer = event.parent.organizer
- with Transaction().set_context(_check_access=False):
+ with Transaction().set_user(0):
events2 = cls.search([
('uuid', '=', event.uuid),
('calendar.owner.email', '=', organizer),
@@ -879,7 +880,8 @@ class Event(ModelSQL, ModelView):
res['status'] = vevent.status.value.lower()
else:
res['status'] = ''
- res['categories'] = [('remove', [c.id for c in event.categories])]
+ if event:
+ res['categories'] = [('remove', [c.id for c in event.categories])]
if hasattr(vevent, 'categories'):
with Transaction().set_context(active_test=False):
categories = Category.search([
@@ -1405,7 +1407,7 @@ class EventAttendee(AttendeeMixin, ModelSQL, ModelView):
attendee_emails = [x.email for x in event.parent.attendees
if x.email != event.parent.organizer]
if attendee_emails:
- with Transaction().set_context(_check_access=False):
+ with Transaction().set_user(0):
events = Event.search([
('uuid', '=', event.uuid),
('calendar.owner.email', 'in',
@@ -1455,7 +1457,7 @@ class EventAttendee(AttendeeMixin, ModelSQL, ModelView):
attendee_emails = [x.email for x in event.parent.attendees
if x.email != event.parent.organizer]
if attendee_emails:
- with Transaction().set_context(_check_access=False):
+ with Transaction().set_user(0):
other_attendees = cls.search([
('event.uuid', '=', event.uuid),
('event.calendar.owner.email', 'in',
@@ -1492,7 +1494,7 @@ class EventAttendee(AttendeeMixin, ModelSQL, ModelView):
attendee_emails = [x.email for x in event.parent.attendees
if x.email != event.parent.organizer]
if attendee_emails:
- with Transaction().set_context(_check_access=False):
+ with Transaction().set_user(0):
attendees = cls.search([
('event.uuid', '=', event.uuid),
('event.calendar.owner.email', 'in',
@@ -1511,7 +1513,7 @@ class EventAttendee(AttendeeMixin, ModelSQL, ModelView):
organizer = event.organizer
else:
organizer = event.parent.organizer
- with Transaction().set_context(_check_access=False):
+ with Transaction().set_user(0):
attendees = cls.search([
('event.uuid', '=', event.uuid),
('event.calendar.owner.email', '=', organizer),
diff --git a/tryton.cfg b/tryton.cfg
index f6bec18..9daa756 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.4.3
depends:
ir
res
diff --git a/trytond_calendar.egg-info/PKG-INFO b/trytond_calendar.egg-info/PKG-INFO
index fb7dddb..e6187c7 100644
--- a/trytond_calendar.egg-info/PKG-INFO
+++ b/trytond_calendar.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-calendar
-Version: 3.4.1
+Version: 3.4.3
Summary: Tryton module for CalDAV
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-calendar
More information about the tryton-debian-vcs
mailing list