diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py index 80166298edb..3a56f15ed3d 100644 --- a/addons/audittrail/audittrail.py +++ b/addons/audittrail/audittrail.py @@ -25,6 +25,7 @@ from tools.translate import _ import ir import pooler import time +import tools class audittrail_rule(osv.osv): """ @@ -33,25 +34,28 @@ class audittrail_rule(osv.osv): _name = 'audittrail.rule' _description = "Audittrail Rule" _columns = { - "name": fields.char("Rule Name", size=32, required=True), - "object_id": fields.many2one('ir.model', 'Object', required=True), - "user_id": fields.many2many('res.users', 'audittail_rules_users', - 'user_id', 'rule_id', 'Users'), - "log_read": fields.boolean("Log reads"), - "log_write": fields.boolean("Log writes"), - "log_unlink": fields.boolean("Log deletes"), - "log_create": fields.boolean("Log creates"), - "state": fields.selection((("draft", "Draft"), - ("subscribed", "Subscribed")), - "State", required=True), - "action_id": fields.many2one('ir.actions.act_window', "Action ID"), + "name": fields.char("Rule Name", size=32, required=True), + "object_id": fields.many2one('ir.model', 'Object', required=True), + "user_id": fields.many2many('res.users', 'audittail_rules_users', + 'user_id', 'rule_id', 'Users', help="if User is not added then it will applicable for all users"), + "log_read": fields.boolean("Log Reads"), + "log_write": fields.boolean("Log Writes"), + "log_unlink": fields.boolean("Log Deletes"), + "log_create": fields.boolean("Log Creates"), + "log_action": fields.boolean("Log Action"), + "log_workflow": fields.boolean("Log Workflow"), + "state": fields.selection((("draft", "Draft"), + ("subscribed", "Subscribed")), + "State", required=True), + "action_id": fields.many2one('ir.actions.act_window', "Action ID"), + } _defaults = { - 'state': lambda *a: 'draft', - 'log_create': lambda *a: 1, - 'log_unlink': lambda *a: 1, - 'log_write': lambda *a: 1, + 'state': lambda *a: 'draft', + 'log_create': lambda *a: 1, + 'log_unlink': lambda *a: 1, + 'log_write': lambda *a: 1, } _sql_constraints = [ @@ -65,7 +69,7 @@ class audittrail_rule(osv.osv): @param cr: the current row, from the database cursor, @param uid: the current user’s ID for security checks, @param ids: List of Auddittrail Rule’s IDs. - @return: True + @return: True """ obj_action = self.pool.get('ir.actions.act_window') obj_model = self.pool.get('ir.model.data') @@ -74,20 +78,20 @@ class audittrail_rule(osv.osv): obj = self.pool.get(thisrule.object_id.model) if not obj: raise osv.except_osv( - _('WARNING: audittrail is not part of the pool'), + _('WARNING: audittrail is not part of the pool'), _('Change audittrail depends -- Setting rule as DRAFT')) self.write(cr, uid, [thisrule.id], {"state": "draft"}) val = { - "name": 'View Log', - "res_model": 'audittrail.log', - "src_model": thisrule.object_id.model, + "name": 'View Log', + "res_model": 'audittrail.log', + "src_model": thisrule.object_id.model, "domain": "[('object_id','=', " + str(thisrule.object_id.id) + "), ('res_id', '=', active_id)]" } - id = obj_action.create(cr, uid, val) - self.write(cr, uid, [thisrule.id], {"state": "subscribed", "action_id": id}) + action_id = obj_action.create(cr, uid, val) + self.write(cr, uid, [thisrule.id], {"state": "subscribed", "action_id": action_id}) keyword = 'client_action_relate' - value = 'ir.actions.act_window,' + str(id) + value = 'ir.actions.act_window,' + str(action_id) res = obj_model.ir_set(cr, uid, 'action', keyword, 'View_log_' + thisrule.object_id.model, [thisrule.object_id.model], value, replace=True, isobject=True, xml_id=False) #End Loop return True @@ -98,7 +102,7 @@ class audittrail_rule(osv.osv): @param cr: the current row, from the database cursor, @param uid: the current user’s ID for security checks, @param ids: List of Auddittrail Rule’s IDs. - @return: True + @return: True """ obj_action = self.pool.get('ir.actions.act_window') val_obj = self.pool.get('ir.values') @@ -127,17 +131,28 @@ class audittrail_log(osv.osv): _name = 'audittrail.log' _description = "Audittrail Log" + def _name_get_resname(self, cr, uid, ids, *args): + data = {} + for resname in self.browse(cr, uid, ids,[]): + model_object = resname.object_id + res_id = resname.res_id + if model_object and res_id: + model_pool = self.pool.get(model_object.model) + res = model_pool.read(cr, uid, res_id, ['name']) + data[resname.id] = res['name'] + else: + data[resname.id] = False + return data + _columns = { - "name": fields.char("Name", size=32), - "object_id": fields.many2one('ir.model', 'Object'), - "user_id": fields.many2one('res.users', 'User'), - "method": fields.selection((('read', 'Read'), - ('write', 'Write'), - ('unlink', 'Delete'), - ('create', 'Create')), "Method"), - "timestamp": fields.datetime("Date"), - "res_id": fields.integer('Resource Id'), - "line_ids": fields.one2many('audittrail.log.line', 'log_id', 'Log lines'), + "name": fields.char("Resource Name",size=64), + # "name": fields.function(_name_get_resname, type='char', string='Resource Name', method=True), + "object_id": fields.many2one('ir.model', 'Object'), + "user_id": fields.many2one('res.users', 'User'), + "method": fields.char("Method", size=64), + "timestamp": fields.datetime("Date"), + "res_id": fields.integer('Resource Id'), + "line_ids": fields.one2many('audittrail.log.line', 'log_id', 'Log lines'), } _defaults = { @@ -155,14 +170,14 @@ class audittrail_log_line(osv.osv): _name = 'audittrail.log.line' _description = "Log Line" _columns = { - 'field_id': fields.many2one('ir.model.fields', 'Fields', required=True), - 'log_id': fields.many2one('audittrail.log', 'Log'), - 'log': fields.integer("Log ID"), - 'old_value': fields.text("Old Value"), - 'new_value': fields.text("New Value"), - 'old_value_text': fields.text('Old value Text'), - 'new_value_text': fields.text('New value Text'), - 'field_description': fields.char('Field Description', size=64), + 'field_id': fields.many2one('ir.model.fields', 'Fields', required=True), + 'log_id': fields.many2one('audittrail.log', 'Log'), + 'log': fields.integer("Log ID"), + 'old_value': fields.text("Old Value"), + 'new_value': fields.text("New Value"), + 'old_value_text': fields.text('Old value Text'), + 'new_value_text': fields.text('New value Text'), + 'field_description': fields.char('Field Description', size=64), } audittrail_log_line() @@ -170,276 +185,366 @@ audittrail_log_line() class audittrail_objects_proxy(osv_pool): """ Uses Object proxy for auditing changes on object of subscribed Rules""" - - def get_value_text(self, cr, uid, field_name, values, object, context=None): + + def get_value_text(self, cr, uid, field_name, values, model, context=None): """ Gets textual values for the fields e.g.: For field of type many2one it gives its name value instead of id @param cr: the current row, from the database cursor, @param uid: the current user’s ID for security checks, - @param field_name: List of fields for text values - @param values: Values for field to be converted into textual values - @return: values: List of textual values for given fields + @param field_name: List of fields for text values + @param values: Values for field to be converted into textual values + @return: values: List of textual values for given fields """ if not context: context = {} pool = pooler.get_pool(cr.dbname) - f_id = pool.get('ir.model.fields').search(cr, uid, [('name', '=', field_name), ('model_id', '=', object.id)]) - if f_id: - field = pool.get('ir.model.fields').read(cr, uid, f_id)[0] - model = field['relation'] + field_pool = pool.get('ir.model.fields') + model_pool = pool.get('ir.model') + obj_pool = pool.get(model.model) + 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', '=', field_name), ('model_id', 'in', (model.id, inherits_ids[0]))]) + else: + field_ids = field_pool.search(cr, uid, [('name', '=', field_name), ('model_id', '=', model.id)]) + field_id = field_ids and field_ids[0] or False + assert field_id, _("'%s' field is not exits in '%s' model" %(field_name, model.model)) - if field['ttype'] == 'many2one': - if values: - if type(values) == tuple: - values = values[0] - val = pool.get(model).read(cr, uid, [values], [pool.get(model)._rec_name]) - if val: - return val[0][pool.get(model)._rec_name] - elif field['ttype'] == 'many2many': - value = [] - if values: - for id in values: - val = pool.get(model).read(cr, uid, [id], [pool.get(model)._rec_name]) - if val: - value.append(val[0][pool.get(model)._rec_name]) - return value + field = field_pool.read(cr, uid, field_id) + relation_model = field['relation'] + relation_model_pool = relation_model and pool.get(relation_model) or False - elif field['ttype'] == 'one2many': - if values: - value = [] - for id in values: - val = pool.get(model).read(cr, uid, [id], [pool.get(model)._rec_name]) + if field['ttype'] == 'many2one': + res = False + relation_id = False + if values and type(values) == tuple: + relation_id = values[0] + if relation_id and relation_model_pool: + relation_model_object = relation_model_pool.read(cr, uid, relation_id, [relation_model_pool._rec_name]) + res = relation_model_object[relation_model_pool._rec_name] + return res - if val: - value.append(val[0][pool.get(model)._rec_name]) - return value - return values + elif field['ttype'] in ('many2many','one2many'): + res = [] + for relation_model_object in relation_model_pool.read(cr, uid, values, [relation_model_pool._rec_name]): + res.append(relation_model_object[relation_model_pool._rec_name]) + return res - def create_log_line(self, cr, uid, id, object, lines=[]): + return values + + def create_log_line(self, cr, uid, log_id, model, lines=[]): """ Creates lines for changed fields with its old and new values @param cr: the current row, from the database cursor, @param uid: the current user’s ID for security checks, - @param object: Object who's values are being changed + @param model: Object who's values are being changed @param lines: List of values for line is to be created """ - pool = pooler.get_pool(cr.dbname) - obj = pool.get(object.model) + obj_pool = pool.get(model.model) + model_pool = pool.get('ir.model') + field_pool = pool.get('ir.model.fields') + log_line_pool = pool.get('audittrail.log.line') #start Loop for line in lines: - if obj._inherits: - inherits_ids = pool.get('ir.model').search(cr, uid, [('model', '=', obj._inherits.keys()[0])]) - f_id = pool.get('ir.model.fields').search(cr, uid, [('name', '=', line['name']), ('model_id', 'in', (object.id, inherits_ids[0]))]) + 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]))]) else: - f_id = pool.get('ir.model.fields').search(cr, uid, [('name', '=', line['name']), ('model_id', '=', object.id)]) - if f_id: - fields = pool.get('ir.model.fields').read(cr, uid, f_id) - old_value = 'old_value' in line and line['old_value'] or '' - new_value = 'new_value' in line and line['new_value'] or '' - old_value_text = 'old_value_text' in line and line['old_value_text'] or '' - new_value_text = 'new_value_text' in line and line['new_value_text'] or '' - - if old_value_text == new_value_text: - continue - if fields[0]['ttype'] == 'many2one': - if type(old_value) == tuple: - old_value = old_value[0] - if type(new_value) == tuple: - new_value = new_value[0] - vals = { - "log_id": id, - "field_id": f_id[0], - "old_value": old_value, - "new_value": new_value, - "old_value_text": old_value_text, - "new_value_text": new_value_text, - "field_description": fields[0]['field_description'] - } - line_id = pool.get('audittrail.log.line').create(cr, uid, vals) - cr.commit() - #End Loop + field_ids = field_pool.search(cr, uid, [('name', '=', line['name']), ('model_id', '=', model.id)]) + field_id = field_ids and field_ids[0] or False + assert field_id, _("'%s' field is not exits in '%s' model" %(line['name'], model.model)) + + field = field_pool.read(cr, uid, field_id) + old_value = 'old_value' in line and line['old_value'] or '' + new_value = 'new_value' in line and line['new_value'] or '' + old_value_text = 'old_value_text' in line and line['old_value_text'] or '' + new_value_text = 'new_value_text' in line and line['new_value_text'] or '' + + if old_value_text == new_value_text: + continue + if field['ttype'] == 'many2one': + if type(old_value) == tuple: + old_value = old_value[0] + if type(new_value) == tuple: + new_value = new_value[0] + vals = { + "log_id": log_id, + "field_id": field_id, + "old_value": old_value, + "new_value": new_value, + "old_value_text": old_value_text, + "new_value_text": new_value_text, + "field_description": field['field_description'] + } + line_id = log_line_pool.create(cr, uid, vals) + #End Loop return True - def log_fct(self, db, uid, object, method, fct_src, *args): + + def log_fct(self, db, uid, model, method, fct_src, *args): """ Logging function: This function is performs logging oprations according to method @param db: the current database @param uid: the current user’s ID for security checks, @param object: Object who's values are being changed - @param method: method to log: create, read, write, unlink + @param method: method to log: create, read, write, unlink @param fct_src: execute method of Object proxy - - @return: Returns result as per method of Object proxy + + @return: Returns result as per method of Object proxy """ - logged_uids = [] + res2 = args pool = pooler.get_pool(db) cr = pooler.get_db(db).cursor() - obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object)]) - model_object = pool.get('ir.model').browse(cr, uid, obj_ids)[0] + resource_pool = pool.get(model) + log_pool = pool.get('audittrail.log') + model_pool = pool.get('ir.model') + + model_ids = model_pool.search(cr, uid, [('model', '=', model)]) + model_id = model_ids and model_ids[0] or False + assert model_id, _("'%s' Model is not exits..." %(model)) + model = model_pool.browse(cr, uid, model_id) + if method in ('create'): - res_id = fct_src(db, uid, object, method, *args) + res_id = fct_src(db, uid, model.model, method, *args) cr.commit() - new_value = pool.get(model_object.model).read(cr, uid, [res_id], args[0].keys())[0] - if 'id' in new_value: - del new_value['id'] - if not logged_uids or uid in logged_uids: - resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id]) - resource_name = resource_name and resource_name[0][1] or '' - vals = { - "method": method, - "object_id": model_object.id, - "user_id": uid, "res_id": res_id, - "name": resource_name - } - id = pool.get('audittrail.log').create(cr, uid, vals) - lines = [] - for field in new_value: - if new_value[field]: - line = { - 'name': field, - 'new_value': new_value[field], - 'new_value_text': self.get_value_text(cr, uid, field, new_value[field], model_object) - } - lines.append(line) - self.create_log_line(cr, uid, id, model_object, lines) + resource = resource_pool.read(cr, uid, res_id, args[0].keys()) + vals = { + "method": method, + "object_id": model.id, + "user_id": uid, + "res_id": resource['id'], + } + if 'id' in resource: + del resource['id'] + log_id = log_pool.create(cr, uid, vals) + lines = [] + for field in resource: + line = { + 'name': field, + 'new_value': resource[field], + 'new_value_text': self.get_value_text(cr, uid, field, resource[field], model) + } + lines.append(line) + self.create_log_line(cr, uid, log_id, model, lines) + cr.commit() cr.close() return res_id - if method in ('write'): - res_ids = args[0] - for res_id in res_ids: - old_values = pool.get(model_object.model).read(cr, uid, res_id, args[1].keys()) - old_values_text = {} - for field in args[1].keys(): - old_values_text[field] = self.get_value_text(cr, uid, field, old_values[field], model_object) - res = fct_src(db, uid, object, method, *args) - cr.commit() - if res: - new_values = pool.get(model_object.model).read(cr, uid, res_ids, args[1].keys())[0] - if not logged_uids or uid in logged_uids: - resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id]) - resource_name = resource_name and resource_name[0][1] or '' - id = pool.get('audittrail.log').create(cr, uid, {"method": method, "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name}) - lines = [] - for field in args[1].keys(): - if args[1].keys(): - line = { - 'name': field, - 'new_value': field in new_values and new_values[field] or '', - 'old_value': field in old_values and old_values[field] or '', - 'new_value_text': self.get_value_text(cr, uid, field, new_values[field], model_object), - 'old_value_text': old_values_text[field] - } - lines.append(line) - cr.commit() - self.create_log_line(cr, uid, id, model_object, lines) - cr.close() - return res - - if method in ('read'): + elif method in ('read'): res_ids = args[0] old_values = {} - res = fct_src(db, uid, object, method, *args) + res = fct_src(db, uid, model.model, method, *args) if type(res) == list: - for v in res: old_values[v['id']] = v else: old_values[res['id']] = res for res_id in old_values: - if not logged_uids or uid in logged_uids: - resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id]) - resource_name = resource_name and resource_name[0][1] or '' - id = pool.get('audittrail.log').create(cr, uid, {"method": method, "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name}) - lines = [] - for field in old_values[res_id]: - if old_values[res_id][field]: - line = { - 'name': field, - 'old_value': old_values[res_id][field], - 'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model_object) - } - lines.append(line) - cr.commit() - self.create_log_line(cr, uid, id, model_object, lines) + vals = { + "method": method, + "object_id": model.id, + "user_id": uid, + "res_id": res_id, + + } + log_id = log_pool.create(cr, uid, vals) + lines = [] + for field in old_values[res_id]: + line = { + 'name': field, + 'old_value': old_values[res_id][field], + 'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model) + } + lines.append(line) + + self.create_log_line(cr, uid, log_id, model, lines) + cr.close() return res - if method in ('unlink'): + elif method in ('unlink'): res_ids = args[0] old_values = {} for res_id in res_ids: - old_values[res_id] = pool.get(model_object.model).read(cr, uid, res_id, []) + old_values[res_id] = resource_pool.read(cr, uid, res_id) for res_id in res_ids: - if not logged_uids or uid in logged_uids: - resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id]) - resource_name = resource_name and resource_name[0][1] or '' - id = pool.get('audittrail.log').create(cr, uid, {"method": method, "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name}) - lines = [] - for field in old_values[res_id]: - if old_values[res_id][field]: - line = { - 'name': field, - 'old_value': old_values[res_id][field], - 'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model_object) - } - lines.append(line) - cr.commit() - self.create_log_line(cr, uid, id, model_object, lines) - res = fct_src(db, uid, object, method, *args) + vals = { + "method": method, + "object_id": model.id, + "user_id": uid, + "res_id": res_id, + + } + log_id = log_pool.create(cr, uid, vals) + lines = [] + for field in old_values[res_id]: + if field in ('id'): + continue + line = { + 'name': field, + 'old_value': old_values[res_id][field], + 'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model) + } + lines.append(line) + + self.create_log_line(cr, uid, log_id, model, lines) + res = fct_src(db, uid, model.model, method, *args) + cr.commit() cr.close() return res - cr.close() + else: + res_ids = args[0] + old_values = {} + fields = [] + if len(args)>1 and type(args[1]) == dict: + fields = args[1].keys() + if type(res_ids) in (long, int): + res_ids = [res_ids] + if res_ids: + for resource in resource_pool.read(cr, uid, res_ids): + resource_id = resource['id'] + if 'id' in resource: + del resource['id'] + old_values_text = {} + old_value = {} + for field in resource.keys(): + old_value[field] = resource[field] + 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} - def execute(self, db, uid, object, method, *args, **kw): + res = fct_src(db, uid, model.model, method, *args) + cr.commit() + + if res_ids: + for resource in resource_pool.read(cr, uid, res_ids): + resource_id = resource['id'] + if 'id' in resource: + del resource['id'] + vals = { + "method": method, + "object_id": model.id, + "user_id": uid, + "res_id": resource_id, + } + + + log_id = log_pool.create(cr, uid, vals) + lines = [] + for field in resource.keys(): + line = { + 'name': field, + 'new_value': resource[field], + 'old_value': old_values[resource_id]['value'][field], + 'new_value_text': self.get_value_text(cr, uid, field, resource[field], model), + 'old_value_text': old_values[resource_id]['text'][field] + } + lines.append(line) + + self.create_log_line(cr, uid, log_id, model, lines) + cr.commit() + cr.close() + return res + return True + + + + def execute(self, db, uid, model, method, *args, **kw): """ Overrides Object Proxy execute method @param db: the current database @param uid: the current user’s ID for security checks, @param object: Object who's values are being changed - @param method: method to log: create, read, write, unlink - - @return: Returns result as per method of Object proxy + @param method: get any method and create log + + @return: Returns result as per method of Object proxy """ pool = pooler.get_pool(db) + model_pool = pool.get('ir.model') + rule_pool = pool.get('audittrail.rule') cr = pooler.get_db(db).cursor() cr.autocommit(True) logged_uids = [] fct_src = super(audittrail_objects_proxy, self).execute - def my_fct(db, uid, object, method, *args): - field = method + def my_fct(db, uid, model, method, *args): rule = False - obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object)]) - for obj_name in pool.obj_list(): - if obj_name == 'audittrail.rule': + model_ids = model_pool.search(cr, uid, [('model', '=', model)]) + model_id = model_ids and model_ids[0] or False + + for model_name in pool.obj_list(): + if model_name == 'audittrail.rule': rule = True if not rule: - return fct_src(db, uid, object, method, *args) - if not obj_ids: - return fct_src(db, uid, object, method, *args) - rule_ids = pool.get('audittrail.rule').search(cr, uid, [('object_id', '=', obj_ids[0]), ('state', '=', 'subscribed')]) - if not rule_ids: - return fct_src(db, uid, object, method, *args) + return fct_src(db, uid, model, method, *args) + if not model_id: + return fct_src(db, uid, model, method, *args) - for thisrule in pool.get('audittrail.rule').browse(cr, uid, rule_ids): + 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) + + 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 field in ('read', 'write', 'create', 'unlink'): - if getattr(thisrule, 'log_' + field): - return self.log_fct(db, uid, object, method, fct_src, *args) - return fct_src(db, uid, object, method, *args) - res = my_fct(db, uid, object, method, *args) + if method in ('read', 'write', 'create', 'unlink'): + if getattr(thisrule, 'log_' + method): + return self.log_fct(db, uid, 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 fct_src(db, uid, model, method, *args) + res = my_fct(db, uid, model, method, *args) cr.close() return res + + def exec_workflow(self, db, uid, model, method, *args, **argv): + pool = pooler.get_pool(db) + cr = pooler.get_db(db).cursor() + cr.autocommit(True) + logged_uids = [] + fct_src = super(audittrail_objects_proxy, self).exec_workflow + field = method + rule = False + model_pool = pool.get('ir.model') + rule_pool = pool.get('audittrail.rule') + model_ids = model_pool.search(cr, uid, [('model', '=', model)]) + for obj_name in pool.obj_list(): + if obj_name == 'audittrail.rule': + rule = True + if not rule: + cr.close() + return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv) + if not model_ids: + cr.close() + return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv) + + rule_ids = rule_pool.search(cr, uid, [('object_id', 'in', model_ids), ('state', '=', 'subscribed')]) + if not rule_ids: + cr.close() + return super(audittrail_objects_proxy, self).exec_workflow(db, uid, 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: + cr.close() + return self.log_fct(db, uid, model, method, fct_src, *args) + cr.close() + return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv) + + cr.close() + return True + audittrail_objects_proxy() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml index a79e6a0b6c0..17b2594d470 100644 --- a/addons/audittrail/audittrail_view.xml +++ b/addons/audittrail/audittrail_view.xml @@ -12,12 +12,15 @@
- - - - - - + + + + + + + + +