Merge lp:~openerp-dev/openobject-addons/7.0-opw-595521-rgo into lp:openobject-addons/7.0

[Ravi Gohil (OpenERP)]

Hi,

If anonymization was done on few fields of any custom module, and at the time of reverse anonymization process, if that particular module isn't placed in addons directory(probably reason: the custom module code is not migrated and is not supported with current version yet), then the fields of such models will not going to be unanonymized. So, the state of such fields should not be changed from "Anonymized" to "Clear".

Currently, it changes the state of such fields to "Clear" state and shows the database in stable state, where in-fact, it isn't.

This branch fixes this issue, kindly review it.

Thanks.

Unmerged revisions

9423. By Ravi Gohil (OpenERP) on 2013-09-09

[FIX] anonymization: In the reverse anonymization process, the fields, which are still in anonymized state, are marked as Clear and wrongly shows the database in stable state. (Maintenance: 595521)

=== modified file 'anonymization/anonymization.py'
--- anonymization/anonymization.py	2013-06-07 11:38:29 +0000
+++ anonymization/anonymization.py	2013-09-09 11:25:48 +0000
@@ -509,6 +509,7 @@
         """Set the 'clear' state to defined fields"""
         ir_model_fields_anonymization_model = self.pool.get('ir.model.fields.anonymization')
         anonymization_history_model = self.pool.get('ir.model.fields.anonymization.history')
+        unknown_models = []
 
         # create a new history record:
         vals = {
@@ -544,7 +545,10 @@
 
             for line in data:
                 queries = []
-                table_name = self.pool.get(line['model_id'])._table if self.pool.get(line['model_id']) else None
+                if self.pool.get(line['model_id']):
+                    table_name = self.pool.get(line['model_id'])._table
+                else:
+                    unknown_models.append(line['model_id'])
 
                 # check if custom sql exists:
                 key = (line['model_id'], line['field_id'])
@@ -574,7 +578,7 @@
 
             # update the anonymization fields:
             ir_model_fields_anonymization_model = self.pool.get('ir.model.fields.anonymization')
-            field_ids = ir_model_fields_anonymization_model.search(cr, uid, [('state', '<>', 'not_existing')], context=context)
+            field_ids = ir_model_fields_anonymization_model.search(cr, uid, [('model_name', 'not in', unknown_models), ('state', '<>', 'not_existing')], context=context)
             values = {
                 'state': 'clear',
             }
@@ -583,6 +587,9 @@
             # add a result message in the wizard:
             msg = '\n'.join(["Successfully reversed the anonymization.",
                              "",
+                            ]) if not unknown_models else \
+                  '\n'.join(["Reverse anonymization was unsuccessful for few fields!",
+                             "",
                             ])
 
             self.write(cr, uid, ids, {'msg': msg})