[tryton-debian-vcs] tryton-modules-calendar branch upstream-2.2 created. 6a1a117993afb9357948202148ef9e18061f9093

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:59:30 UTC 2013


The following commit has been merged in the upstream-2.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-calendar.git;a=commitdiff;h=6a1a117993afb9357948202148ef9e18061f9093
commit 6a1a117993afb9357948202148ef9e18061f9093
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Feb 24 19:46:12 2013 +0100

    Adding upstream version 2.2.2.

diff --git a/CHANGELOG b/CHANGELOG
index 3dfb301..552ff9b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.2 - 2012-11-05
+* Bug fixes (see mercurial logs for details)
+
 Version 2.2.1 - 2012-09-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index e2fdd86..245f5e7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_calendar
-Version: 2.2.1
+Version: 2.2.2
 Summary: Add CalDAV support
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 0903eb8..5f3efd9 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
     'name_es_ES' : 'Calendario',
     'name_fr_FR' : 'Calendrier',
     'name_ru_RU' : 'Календарь',
-    'version' : '2.2.1',
+    'version' : '2.2.2',
     'author' : 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/calendar.py b/calendar.py
index e5f6e6b..d547ae6 100644
--- a/calendar.py
+++ b/calendar.py
@@ -554,7 +554,7 @@ class Event(ModelSQL, ModelView):
         return res
 
     def search_calendar_field(self, name, clause):
-        return [('calendar.' + name[9:],) + clause[1:]]
+        return [('calendar.' + name[9:],) + tuple(clause[1:])]
 
     def check_recurrence(self, ids):
         '''
@@ -599,11 +599,13 @@ class Event(ModelSQL, ModelView):
                             new_id = self.copy(event.id, default={
                                 'calendar': calendar_id,
                                 'occurences': False,
+                                'uuid': event.uuid,
                                 })
                             for occurence in event.occurences:
                                 self.copy(occurence.id, default={
                                     'calendar': calendar_id,
                                     'parent': new_id,
+                                    'uuid': occurence.uuid,
                                     })
                     else:
                         parent_ids = self.search([
@@ -616,6 +618,7 @@ class Event(ModelSQL, ModelView):
                             self.copy(event.id, default={
                                 'calendar': parent.calendar.id,
                                 'parent': parent.id,
+                                'uuid': event.uuid,
                                 })
         # Restart the cache for event
         collection_obj.event.reset()
@@ -716,11 +719,13 @@ class Event(ModelSQL, ModelView):
                                 new_id = self.copy(event.id, default={
                                     'calendar': calendar_id,
                                     'occurences': False,
+                                    'uuid': event.uuid,
                                     })
                                 for occurence in event.occurences:
                                     self.copy(occurence.id, default={
                                         'calendar': calendar_id,
                                         'parent': new_id,
+                                        'uuid': occurence.uuid,
                                         })
                         else:
                             parent_ids = self.search([
@@ -733,6 +738,7 @@ class Event(ModelSQL, ModelView):
                                 self.copy(event.id, default={
                                     'calendar': parent.calendar.id,
                                     'parent': parent.id,
+                                    'uuid': event.uuid,
                                     })
         # Restart the cache for event
         collection_obj.event.reset()
diff --git a/trytond_calendar.egg-info/PKG-INFO b/trytond_calendar.egg-info/PKG-INFO
index 69e15d0..b0d2a3f 100644
--- a/trytond_calendar.egg-info/PKG-INFO
+++ b/trytond_calendar.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-calendar
-Version: 2.2.1
+Version: 2.2.2
 Summary: Add CalDAV support
 Home-page: http://www.tryton.org/
 Author: B2CK
commit e763f8e8b49e20f35f28f019b6c71e265814548e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Sep 12 15:53:53 2012 +0200

    Adding upstream version 2.2.1.

diff --git a/CHANGELOG b/CHANGELOG
index b9c58e4..3dfb301 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.1 - 2012-09-02
+* Bug fixes (see mercurial logs for details)
+
 Version 2.2.0 - 2011-10-24
 * Bug fixes (see mercurial logs for details)
 * Basic support of event time-range filter
diff --git a/COPYRIGHT b/COPYRIGHT
index 1245dd5..0650193 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2011 Cédric Krier.
+Copyright (C) 2009-2012 Cédric Krier.
 Copyright (C) 2009-2011 Bertrand Chenal.
-Copyright (C) 2009-2011 B2CK SPRL.
+Copyright (C) 2009-2012 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index bf5bc32..e2fdd86 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_calendar
-Version: 2.2.0
+Version: 2.2.1
 Summary: Add CalDAV support
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index b4aa5d1..0903eb8 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
     'name_es_ES' : 'Calendario',
     'name_fr_FR' : 'Calendrier',
     'name_ru_RU' : 'Календарь',
-    'version' : '2.2.0',
+    'version' : '2.2.1',
     'author' : 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/calendar.py b/calendar.py
index 24d3635..e5f6e6b 100644
--- a/calendar.py
+++ b/calendar.py
@@ -545,8 +545,8 @@ class Event(ModelSQL, ModelView):
         assert name in ('calendar_owner', 'calendar_read_users',
                 'calendar_write_users'), 'Invalid name'
         res = {}
+        name = name[9:]
         for event in self.browse(ids):
-            name = name[9:]
             if name in ('read_users', 'write_users'):
                 res[event.id] = [x.id for x in event.calendar[name]]
             else:
@@ -738,6 +738,25 @@ class Event(ModelSQL, ModelView):
         collection_obj.event.reset()
         return res
 
+    def copy(self, ids, default=None):
+        int_id = isinstance(ids, (int, long))
+        if int_id:
+            ids = [ids]
+
+        if default is None:
+            default = {}
+
+        new_ids = []
+        for event_id in ids:
+            current_default = default.copy()
+            current_default['uuid'] = self.default_uuid()
+            new_id = super(Event, self).copy(event_id, default=current_default)
+            new_ids.append(new_id)
+
+        if int_id:
+            return new_ids[0]
+        return new_ids
+
     def delete(self, ids):
         attendee_obj = Pool().get('calendar.event.attendee')
         collection_obj = Pool().get('webdav.collection')
@@ -1066,7 +1085,7 @@ class Event(ModelSQL, ModelView):
         ical = vobject.iCalendar()
         vevent = ical.add('vevent')
         if event.vevent:
-            ical.vevent = vobject.readOne(event.vevent)
+            ical.vevent = vobject.readOne(str(event.vevent))
             vevent = ical.vevent
             ical.vevent.transformToNative()
         if event.summary:
@@ -1239,7 +1258,7 @@ class Alarm(ModelSQL):
         '''
         valarm = None
         if alarm.valarm:
-            valarm = vobject.readOne(alarm.valarm)
+            valarm = vobject.readOne(str(alarm.valarm))
         return valarm
 
 Alarm()
@@ -1357,7 +1376,7 @@ class Attendee(ModelSQL, ModelView):
         res = None
         if attendee.attendee:
             res = vobject.base.textLineToContentLine(
-                    attendee.attendee.replace('\r\n ', ''))
+                    str(attendee.attendee).replace('\r\n ', ''))
         else:
             res = vobject.base.ContentLine('ATTENDEE', [], '')
 
diff --git a/trytond_calendar.egg-info/PKG-INFO b/trytond_calendar.egg-info/PKG-INFO
index 7a50dec..69e15d0 100644
--- a/trytond_calendar.egg-info/PKG-INFO
+++ b/trytond_calendar.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond-calendar
-Version: 2.2.0
+Version: 2.2.1
 Summary: Add CalDAV support
 Home-page: http://www.tryton.org/
 Author: B2CK
-- 
tryton-modules-calendar



More information about the tryton-debian-vcs mailing list