[tryton-debian-vcs] tryton-modules-calendar-todo branch upstream-2.2 created. dd964e4f19e084495c69c9b8e1cc1c7f7dfb3be0
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:00:16 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-todo.git;a=commitdiff;h=dd964e4f19e084495c69c9b8e1cc1c7f7dfb3be0
commit dd964e4f19e084495c69c9b8e1cc1c7f7dfb3be0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 19:46:14 2013 +0100
Adding upstream version 2.2.2.
diff --git a/CHANGELOG b/CHANGELOG
index e56db5b..77db8db 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 4a68e38..e5b8c94 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_calendar_todo
-Version: 2.2.1
+Version: 2.2.2
Summary: Add Todo support on CalDAV
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 0601ce4..7f5e1cb 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
'name_es_ES': 'Calendario de tareas',
'name_fr_FR' : 'Tâche 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/todo.py b/todo.py
index 606e7cd..fd7a394 100644
--- a/todo.py
+++ b/todo.py
@@ -177,7 +177,7 @@ class Todo(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):
'''
@@ -222,11 +222,13 @@ class Todo(ModelSQL, ModelView):
new_id = self.copy(todo.id, default={
'calendar': calendar_id,
'occurences': False,
+ 'uuid': todo.uuid,
})
for occurence in todo.occurences:
self.copy(occurence.id, default={
'calendar': calendar_id,
'parent': new_id,
+ 'uuid': occurence.uuid,
})
else:
parent_ids = self.search([
@@ -239,6 +241,7 @@ class Todo(ModelSQL, ModelView):
self.copy(todo.id, default={
'calendar': parent.calendar.id,
'parent': parent.id,
+ 'uuid': todo.uuid,
})
# Restart the cache for todo
collection_obj.todo.reset()
@@ -336,11 +339,13 @@ class Todo(ModelSQL, ModelView):
new_id = self.copy(todo.id, default={
'calendar': calendar_id,
'occurences': False,
+ 'uuid': todo.uuid,
})
for occurence in todo.occurences:
self.copy(occurence.id, default={
'calendar': calendar_id,
'parent': new_id,
+ 'uuid': occurence.uuid,
})
else:
parent_ids = self.search([
@@ -353,6 +358,7 @@ class Todo(ModelSQL, ModelView):
self.copy(todo.id, default={
'calendar': parent.calendar.id,
'parent': parent.id,
+ 'uuid': todo.uuid,
})
# Restart the cache for todo
collection_obj.todo.reset()
@@ -420,7 +426,7 @@ class Todo(ModelSQL, ModelView):
new_ids = []
for todo_id in ids:
current_default = default.copy()
- current_default['uuid'] = self.default_uuid()
+ current_default.setdefault('uuid', self.default_uuid())
new_id = super(Todo, self).copy(todo_id, default=current_default)
new_ids.append(new_id)
diff --git a/trytond_calendar_todo.egg-info/PKG-INFO b/trytond_calendar_todo.egg-info/PKG-INFO
index dbe21be..d7b3570 100644
--- a/trytond_calendar_todo.egg-info/PKG-INFO
+++ b/trytond_calendar_todo.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-calendar-todo
-Version: 2.2.1
+Version: 2.2.2
Summary: Add Todo support on CalDAV
Home-page: http://www.tryton.org/
Author: B2CK
commit 4ebdf9c8f05c0da09658cbdfb339529bb01f2127
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Sep 12 15:53:55 2012 +0200
Adding upstream version 2.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index 72099a7..e56db5b 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)
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 782fc36..4a68e38 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_calendar_todo
-Version: 2.2.0
+Version: 2.2.1
Summary: Add Todo support on CalDAV
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 244dd66..0601ce4 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
'name_es_ES': 'Calendario de tareas',
'name_fr_FR' : 'Tâche 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/todo.py b/todo.py
index 6226af9..606e7cd 100644
--- a/todo.py
+++ b/todo.py
@@ -409,6 +409,25 @@ class Todo(ModelSQL, ModelView):
collection_obj.todo.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 todo_id in ids:
+ current_default = default.copy()
+ current_default['uuid'] = self.default_uuid()
+ new_id = super(Todo, self).copy(todo_id, default=current_default)
+ new_ids.append(new_id)
+
+ if int_id:
+ return new_ids[0]
+ return new_ids
+
def ical2values(self, todo_id, ical, calendar_id, vtodo=None):
'''
Convert iCalendar to values for create or write
@@ -687,7 +706,7 @@ class Todo(ModelSQL, ModelView):
ical = vobject.iCalendar()
vtodo = ical.add('vtodo')
if todo.vtodo:
- ical.vtodo = vobject.readOne(todo.vtodo)
+ ical.vtodo = vobject.readOne(str(todo.vtodo))
vtodo = ical.vtodo
ical.vtodo.transformToNative()
if todo.summary:
diff --git a/trytond_calendar_todo.egg-info/PKG-INFO b/trytond_calendar_todo.egg-info/PKG-INFO
index 41e6827..dbe21be 100644
--- a/trytond_calendar_todo.egg-info/PKG-INFO
+++ b/trytond_calendar_todo.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-calendar-todo
-Version: 2.2.0
+Version: 2.2.1
Summary: Add Todo support on CalDAV
Home-page: http://www.tryton.org/
Author: B2CK
--
tryton-modules-calendar-todo
More information about the tryton-debian-vcs
mailing list