openerp-dev-web team mailing list archive

["tfr \(Openerp\)" <tfr@xxxxxxxxxxx>]

tfr (Openerp) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-722579-rme into lp:openobject-addons.

Requested reviews:
  Bhumika (bhumika-shah)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-722579-rme/+merge/51167

I've push fix that not by pass acces right and use uid for audittrail module, please can you review and test this patch
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-722579-rme/+merge/51167
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-722579-rme.

=== modified file 'audittrail/audittrail.py'
--- audittrail/audittrail.py	2011-01-14 00:11:01 +0000
+++ audittrail/audittrail.py	2011-02-24 16:54:16 +0000
@@ -201,7 +201,7 @@
         if not context:
             context = {}
         if field_name in('__last_update','id'):
-            return values            
+            return values
         pool = pooler.get_pool(cr.dbname)
         field_pool = pool.get('ir.model.fields')
         model_pool = pool.get('ir.model')
@@ -253,7 +253,7 @@
         #start Loop
         for line in lines:
             if line['name'] in('__last_update','id'):
-                continue                
+                continue
             if obj_pool._inherits:
                 inherits_ids = model_pool.search(cr, uid, [('model', '=', obj_pool._inherits.keys()[0])])
                 field_ids = field_pool.search(cr, uid, [('name', '=', line['name']), ('model_id', 'in', (model.id, inherits_ids[0]))])
@@ -301,6 +301,8 @@
 
         @return: Returns result as per method of Object proxy
         """
+        uid_orig = uid
+        uid = 1
         res2 = args
         pool = pooler.get_pool(db)
         cr = pooler.get_db(db).cursor()
@@ -314,7 +316,7 @@
         model = model_pool.browse(cr, uid, model_id)
 
         if method in ('create'):
-            res_id = fct_src(db, uid, model.model, method, *args)
+            res_id = fct_src(db, uid_orig, model.model, method, *args)
             cr.commit()
             resource = resource_pool.read(cr, uid, res_id, args[0].keys())
             vals = {
@@ -343,7 +345,7 @@
         elif method in ('read'):
             res_ids = args[0]
             old_values = {}
-            res = fct_src(db, uid, model.model, method, *args)
+            res = fct_src(db, uid_orig, model.model, method, *args)
             if type(res) == list:
                 for v in res:
                     old_values[v['id']] = v
@@ -399,7 +401,7 @@
                     lines.append(line)
 
                 self.create_log_line(cr, uid, log_id, model, lines)
-            res = fct_src(db, uid, model.model, method, *args)
+            res = fct_src(db, uid_orig, model.model, method, *args)
             cr.commit()
             cr.close()
             return res
@@ -423,7 +425,7 @@
                         old_values_text[field] = self.get_value_text(cr, uid, field, resource[field], model)
                     old_values[resource_id] = {'text':old_values_text, 'value': old_value}
 
-            res = fct_src(db, uid, model.model, method, *args)
+            res = fct_src(db, uid_orig, model.model, method, *args)
             cr.commit()
 
             if res_ids:
@@ -469,6 +471,8 @@
 
         @return: Returns result as per method of Object proxy
         """
+        uid_orig = uid
+        uid = 1
         pool = pooler.get_pool(db)
         model_pool = pool.get('ir.model')
         rule_pool = pool.get('audittrail.rule')
@@ -486,13 +490,13 @@
                 if model_name == 'audittrail.rule':
                     rule = True
             if not rule:
-                return fct_src(db, uid, model, method, *args)
+                return fct_src(db, uid_orig, model, method, *args)
             if not model_id:
-                return fct_src(db, uid, model, method, *args)
+                return fct_src(db, uid_orig, model, method, *args)
 
             rule_ids = rule_pool.search(cr, uid, [('object_id', '=', model_id), ('state', '=', 'subscribed')])
             if not rule_ids:
-                return fct_src(db, uid, model, method, *args)
+                return fct_src(db, uid_orig, model, method, *args)
 
             for thisrule in rule_pool.browse(cr, uid, rule_ids):
                 for user in thisrule.user_id:
@@ -500,13 +504,13 @@
                 if not logged_uids or uid in logged_uids:
                     if method in ('read', 'write', 'create', 'unlink'):
                         if getattr(thisrule, 'log_' + method):
-                            return self.log_fct(db, uid, model, method, fct_src, *args)
+                            return self.log_fct(db, uid_orig, model, method, fct_src, *args)
 
                     elif method not in ('default_get','read','fields_view_get','fields_get','search','search_count','name_search','name_get','get','request_get', 'get_sc', 'unlink', 'write', 'create'):
                         if thisrule.log_action:
-                            return self.log_fct(db, uid, model, method, fct_src, *args)
+                            return self.log_fct(db, uid_orig, model, method, fct_src, *args)
 
-                return fct_src(db, uid, model, method, *args)
+                return fct_src(db, uid_orig, model, method, *args)
         try:
             res = my_fct(db, uid, model, method, *args)
             return res
@@ -514,6 +518,9 @@
             cr.close()
 
     def exec_workflow(self, db, uid, model, method, *args, **argv):
+        uid_orig = uid
+        uid = 1
+
         pool = pooler.get_pool(db)
         logged_uids = []
         fct_src = super(audittrail_objects_proxy, self).exec_workflow
@@ -529,21 +536,21 @@
                 if obj_name == 'audittrail.rule':
                     rule = True
             if not rule:
-                return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
+                return super(audittrail_objects_proxy, self).exec_workflow(db, uid_orig, model, method, *args, **argv)
             if not model_ids:
-                return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
+                return super(audittrail_objects_proxy, self).exec_workflow(db, uid_orig, model, method, *args, **argv)
 
             rule_ids = rule_pool.search(cr, uid, [('object_id', 'in', model_ids), ('state', '=', 'subscribed')])
             if not rule_ids:
-                return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
+                return super(audittrail_objects_proxy, self).exec_workflow(db, uid_orig, model, method, *args, **argv)
 
             for thisrule in rule_pool.browse(cr, uid, rule_ids):
                 for user in thisrule.user_id:
                     logged_uids.append(user.id)
                 if not logged_uids or uid in logged_uids:
                     if thisrule.log_workflow:
-                        return self.log_fct(db, uid, model, method, fct_src, *args)
-                return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
+                        return self.log_fct(db, uid_orig, model, method, fct_src, *args)
+                return super(audittrail_objects_proxy, self).exec_workflow(db, uid_orig, model, method, *args, **argv)
 
             return True
         finally: