Merge lp:~openerp-dev/openobject-addons/trunk-bug-caldav_synch_fix-sgo into lp:openobject-addons

[Sanjay Gohel (Open ERP)]

Hello,

   In caldav synchronization if any recurrent event edited it will b readonly recurrent event created.

Thank You,
SGO

[Roberto López López (bergensk)]

For me it doesn't seem to work (error 403 while creating an event).

In the link below, the stacktrace:

http://paste.ubuntu.com/851073/

Kind regards,

Roberto (rlo)

[Atul Patel(OpenERP) (atp-openerp)]

Hello,
Recurrent event was not created properly.

can you check it..

Thanks

review: Needs Fixing

[Roberto López López (bergensk)]

After new test, the current fix seems ok to me. Thanks.

[Roberto López López (bergensk)]

review: Approve

[Roberto López López (bergensk)]

I forgot to mention that my tests were done on thunderbird.

[lp:~openerp-dev/openobject-addons/trunk-bug-caldav_synch_fix-sgo]

6551. By Sanjay Gohel (Open ERP) on 2012-02-22

[IMP]Resolve delete recurrent problem

6552. By Sanjay Gohel (Open ERP) on 2012-08-27

[MERGE]merge with latest trunk

Unmerged revisions

6552. By Sanjay Gohel (Open ERP) on 2012-08-27

[MERGE]merge with latest trunk

6551. By Sanjay Gohel (Open ERP) on 2012-02-22

[IMP]Resolve delete recurrent problem

6550. By Sanjay Gohel (Open ERP) on 2012-02-22

[IMP]add missing code

6549. By Sanjay Gohel (Open ERP) on 2012-02-21

[IMP]crm_caldav:event create prob

6548. By Sanjay Gohel (Open ERP) on 2012-02-21

[MERGE]: merge with parent branch

6547. By Sanjay Gohel (Open ERP) on 2012-02-21

[IMP]crm_caldav:solve edit one record of reccurence

6546. By Sanjay Gohel (Open ERP) on 2012-02-13

[IMP]caldav create recurrent prob solved

6545. By Sanjay Gohel (Open ERP) on 2012-02-10

[IMP]:fix problem for write n create recurrent data from thunderbird to openerp

=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py	2012-08-10 10:22:57 +0000
+++ base_calendar/base_calendar.py	2012-08-27 05:28:31 +0000
@@ -1012,15 +1012,15 @@
                 result[event] = ""
         return result
 
-    def _rrule_write(self, obj, cr, uid, ids, field_name, field_value, args, context=None):
+    def _rrule_write(self, cr, uid, ids, field_name, field_value, args, context=None):
         data = self._get_empty_rrule_data()
         if field_value:
             data['recurrency'] = True
-            for event in self.browse(cr, uid, ids, context=context):
-                rdate = rule_date or event.date
-                update_data = self._parse_rrule(field_value, dict(data), rdate)
-                data.update(update_data)
-                super(calendar_event, obj).write(cr, uid, ids, data, context=context)
+            event = self.browse(cr, uid, ids, context=context)
+            rdate = event.date
+            update_data = self._parse_rrule(field_value, dict(data), rdate)
+            data.update(update_data)
+            super(calendar_event, self).write(cr, uid, ids, data, context=context)
         return True
 
 
@@ -1124,7 +1124,6 @@
         @param limit: The Number of Results to Return """
         if not context:
             context = {}
-
         result = []
         for data in super(calendar_event, self).read(cr, uid, select, context=context):
             if not data['rrule']:
@@ -1173,9 +1172,7 @@
 
         if isinstance(select, (str, int, long)):
             return ids and ids[0] or False
-        else:
-            ids = list(set(result))
-        return ids
+        return result
 
     def compute_rule_string(self, datas):
         """
@@ -1356,11 +1353,12 @@
 
 
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
+        
         context = context or {}
         if isinstance(ids, (str, int, long)):
             ids = [ids]
         res = False
-
+        new_ids = []
         # Special write of complex IDS
         for event_id in ids[:]:
             if len(str(event_id).split('-')) == 1:
@@ -1385,7 +1383,6 @@
                     })
 
                 new_id = self.copy(cr, uid, real_event_id, default=data, context=context)
-
                 date_new = event_id.split('-')[1]
                 date_new = time.strftime("%Y%m%dT%H%M%S", \
                              time.strptime(date_new, "%Y%m%d%H%M%S"))
@@ -1394,12 +1391,14 @@
 
                 context.update({'active_id': new_id, 'active_ids': [new_id]})
                 continue
+            if not real_event_id in new_ids:
+                new_ids.append(real_event_id)
 
         if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
             vals['vtimezone'] = vals['vtimezone'][40:]
-
-        res = super(calendar_event, self).write(cr, uid, ids, vals, context=context)
-
+        if new_ids:    
+            res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context)
+            
         if ('alarm_id' in vals or 'base_calendar_alarm_id' in vals)\
                 or ('date' in vals or 'duration' in vals or 'date_deadline' in vals):
             alarm_obj = self.pool.get('res.alarm')
@@ -1422,7 +1421,27 @@
                     del re[groupname + "_count"]
             re.get('__context', {}).update({'virtual_id' : virtual_id})
         return res
+    def browse(self, cr, uid, ids, context=None, list_class=None, fields_process=None):
+        """
+        Overrides orm browse method.
+        @param self: the object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of crm meeting's ids
+        @param context: A standard dictionary for contextual values
+        @return: the object list.
+        """
+        if isinstance(ids, (str, int, long)):
+            select = [ids]
+        else:
+            select = ids
+        select = map(lambda x: base_calendar_id2real_id(x), select)
+        res = super(calendar_event, self).browse(cr, uid, select, context, \
+                                                    list_class, fields_process)
+        if isinstance(ids, (str, int, long)):
+            return res and res[0] or False
 
+        return res
     def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
         # FIXME This whole id mangling has to go!
         if context is None:
@@ -1489,11 +1508,11 @@
         if not isinstance(ids, list):
             ids = [ids]
         res = False
+        new_ids = []
         attendee_obj=self.pool.get('calendar.attendee')
         for event_id in ids[:]:
             if len(str(event_id).split('-')) == 1:
                 continue
-
             real_event_id = base_calendar_id2real_id(event_id)
             data = self.read(cr, uid, real_event_id, ['exdate'], context=context)
             date_new = event_id.split('-')[1]
@@ -1502,11 +1521,14 @@
             exdate = (data['exdate'] and (data['exdate'] + ',')  or '') + date_new
             self.write(cr, uid, [real_event_id], {'exdate': exdate})
             ids.remove(event_id)
+            if not real_event_id in new_ids:
+                new_ids.append(real_event_id)
+                
         for event in self.browse(cr, uid, ids, context=context):
             if event.attendee_ids:
                 attendee_obj.unlink(cr, uid, [x.id for x in event.attendee_ids], context=context)
-
-        res = super(calendar_event, self).unlink(cr, uid, ids, context=context)
+        if new_ids:
+            res = super(calendar_event, self).unlink(cr, uid, new_ids, context=context)
         self.pool.get('res.alarm').do_alarm_unlink(cr, uid, ids, self._name)
         self.unlink_events(cr, uid, ids, context=context)
         return res
@@ -1515,18 +1537,15 @@
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
-
+        if vals.get('rrule'):
+            data = self._get_empty_rrule_data()
+            update_data = self._parse_rrule(vals.get('rrule'), dict(data), vals.get('date'))
+            vals.update(update_data)  
+            vals['recurrency'] = True
+                           
         if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
             vals['vtimezone'] = vals['vtimezone'][40:]
-
-        #updated_vals = self.onchange_dates(cr, uid, [],
-        #    vals.get('date', False),
-        #    vals.get('duration', False),
-        #    vals.get('date_deadline', False),
-        #    vals.get('allday', False),
-        #    context=context)
-        #vals.update(updated_vals.get('value', {}))
-
+            
         res = super(calendar_event, self).create(cr, uid, vals, context)
         alarm_obj = self.pool.get('res.alarm')
         alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context)
@@ -1794,4 +1813,4 @@
 res_users()
 
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'caldav/calendar.py'
--- caldav/calendar.py	2012-08-07 11:34:14 +0000
+++ caldav/calendar.py	2012-08-27 05:28:31 +0000
@@ -372,7 +372,8 @@
                         model_obj = self.pool.get(model)
                         r_ids = []
                         if model_obj._columns.get('recurrent_uid', None):
-                            cr.execute('SELECT id FROM %s WHERE recurrent_uid=%%s' % model_obj._table,
+                            if (map_field == "recurrent_ids"): 
+                                cr.execute('SELECT id FROM %s WHERE recurrent_uid=%%s' % model_obj._table,
                                         (data[map_field],))
                             r_ids = map(lambda x: x[0], cr.fetchall())
                         if r_ids:
@@ -1297,4 +1298,4 @@
 
 Attendee()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'crm_caldav/crm_caldav.py'
--- crm_caldav/crm_caldav.py	2012-01-31 13:36:57 +0000
+++ crm_caldav/crm_caldav.py	2012-08-27 05:28:31 +0000
@@ -102,9 +102,13 @@
                         if wematch:
                             model, recur_id, dbname = wematch.groups()
                             val.update({'recurrent_uid': recur_id})
-                        event_id = model_obj.create(cr, uid, val)
-                        recur_pool[u_id] = event_id
-                        ids.append(event_id)
+                        if val.get('recurrent_id') or not context.get('res_id'):
+                            event_id = model_obj.create(cr, uid, val)
+                            recur_pool[u_id] = event_id
+                            ids.append(event_id)
+                        else:    
+                            recur_pool[u_id] = context.get('res_id') 
+                            ids.append(context.get('res_id'))
         except Exception:
             raise
         return ids