Merge lp:~therp-nl/openobject-addons/7.0-lp1078689-audittrail_bad_performance_and_infinit_recursion into lp:openobject-addons

[Stefan Rijnhart (Opener)]

Unmerged revisions

8034. By Stefan Rijnhart (Opener) on 2012-11-14

[FIX] Audittrail: bad performance and infinite recursion

=== modified file 'audittrail/audittrail.py'
--- audittrail/audittrail.py	2012-11-12 08:40:18 +0000
+++ audittrail/audittrail.py	2012-11-14 12:20:30 +0000
@@ -174,6 +174,8 @@
 class audittrail_objects_proxy(object_proxy):
     """ Uses Object proxy for auditing changes on object of subscribed Rules"""
 
+    _default_recursive_level = 1
+
     def get_value_text(self, cr, uid, pool, resource_pool, method, field, value):
         """
         Gets textual values for the fields.
@@ -303,7 +305,7 @@
         self.process_data(cr, uid_orig, pool, res_ids, model, method, old_values, new_values, field_list)
         return res
 
-    def get_data(self, cr, uid, pool, res_ids, model, method):
+    def get_data(self, cr, uid, pool, res_ids, model, method, recursive_level=None):
         """
         This function simply read all the fields of the given res_ids, and also recurisvely on
         all records of a x2m fields read that need to be logged. Then it returns the result in
@@ -322,6 +324,8 @@
                                            },
                 }
         """
+        if recursive_level is None:
+            recursive_level = self._default_recursive_level
         data = {}
         resource_pool = pool.get(model.model)
         # read all the fields of the given resources in super admin mode
@@ -338,7 +342,7 @@
                 values_text[field] = self.get_value_text(cr, SUPERUSER_ID, pool, resource_pool, method, field, resource[field])
 
                 field_obj = resource_pool._all_columns.get(field).column
-                if field_obj._type in ('one2many','many2many'):
+                if field_obj._type in ('one2many','many2many') and recursive_level:
                     # check if an audittrail rule apply in super admin mode
                     if self.check_rules(cr, SUPERUSER_ID, field_obj._obj, method):
                         # check if the model associated to a *2m field exists, in super admin mode
@@ -347,11 +351,11 @@
                         assert x2m_model_id, _("'%s' Model does not exist..." %(field_obj._obj))
                         x2m_model = pool.get('ir.model').browse(cr, SUPERUSER_ID, x2m_model_id)
                         #recursive call on x2m fields that need to be checked too
-                        data.update(self.get_data(cr, SUPERUSER_ID, pool, resource[field], x2m_model, method))
+                        data.update(self.get_data(cr, SUPERUSER_ID, pool, resource[field], x2m_model, method, recursive_level - 1))
             data[(model.id, resource_id)] = {'text':values_text, 'value': values}
         return data
 
-    def prepare_audittrail_log_line(self, cr, uid, pool, model, resource_id, method, old_values, new_values, field_list=None):
+    def prepare_audittrail_log_line(self, cr, uid, pool, model, resource_id, method, old_values, new_values, field_list=None, recursive_level=None):
         """
         This function compares the old data (i.e before the method was executed) and the new data
         (after the method was executed) and returns a structure with all the needed information to
@@ -380,6 +384,8 @@
         The reason why the structure returned is build as above is because when modifying an existing
         record, we may have to log a change done in a x2many field of that object
         """
+        if recursive_level is None:
+            recursive_level = self._default_recursive_level
         if field_list is None:
             field_list = []
         key = (model.id, resource_id)
@@ -394,7 +400,7 @@
             if field_list and field_name not in field_list:
                 continue
             field_obj = field_definition.column
-            if field_obj._type in ('one2many','many2many'):
+            if field_obj._type in ('one2many','many2many') and recursive_level:
                 # checking if an audittrail rule apply in super admin mode
                 if self.check_rules(cr, SUPERUSER_ID, field_obj._obj, method):
                     # checking if the model associated to a *2m field exists, in super admin mode
@@ -409,7 +415,7 @@
                     # We use list(set(...)) to remove duplicates.
                     res_ids = list(set(x2m_old_values_ids + x2m_new_values_ids))
                     for res_id in res_ids:
-                        lines.update(self.prepare_audittrail_log_line(cr, SUPERUSER_ID, pool, x2m_model, res_id, method, old_values, new_values, field_list))
+                        lines.update(self.prepare_audittrail_log_line(cr, SUPERUSER_ID, pool, x2m_model, res_id, method, old_values, new_values, field_list, recursive_level=recursive_level - 1))
             # if the value value is different than the old value: record the change
             if key not in old_values or key not in new_values or old_values[key]['value'][field_name] != new_values[key]['value'][field_name]:
                 data = {