Techsystech
/
server-tools
mirror of https://github.com/OCA/server-tools.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[FIX] Module 'auditlog' - Fix some flake8 errors

pull/2466/head
sebalix 2015-01-22 12:05:05 +01:00 committed by Stefan Rijnhart
parent 65517c4bcf
commit 0ac666a32d
2 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
auditlog/models/log.py
View File

@ -50,7 +50,6 @@ class auditlog_log_line(models.Model):
'ir.model.fields', string=u"Field", required=True) 'ir.model.fields', string=u"Field", required=True)
log_id = fields.Many2one( log_id = fields.Many2one(
'auditlog.log', string=u"Log", ondelete='cascade') 'auditlog.log', string=u"Log", ondelete='cascade')
#log = fields.Integer(u"Log ID")
old_value = fields.Text(u"Old Value") old_value = fields.Text(u"Old Value")
new_value = fields.Text(u"New Value") new_value = fields.Text(u"New Value")
old_value_text = fields.Text(u"Old value Text") old_value_text = fields.Text(u"Old value Text")

74
auditlog/models/rule.py
View File

@ -89,14 +89,14 @@ class auditlog_rule(models.Model):
u"Log Creates", default=True, u"Log Creates", default=True,
help=(u"Select this if you want to keep track of creation on any " help=(u"Select this if you want to keep track of creation on any "
u"record of the model of this rule")) u"record of the model of this rule"))
#log_action = fields.Boolean( # log_action = fields.Boolean(
# "Log Action", # "Log Action",
# help=("Select this if you want to keep track of actions on the " # help=("Select this if you want to keep track of actions on the "
# "model of this rule")) # "model of this rule"))
#log_workflow = fields.Boolean( # log_workflow = fields.Boolean(
# "Log Workflow", # "Log Workflow",
# help=("Select this if you want to keep track of workflow on any " # help=("Select this if you want to keep track of workflow on any "
# "record of the model of this rule")) # "record of the model of this rule"))
state = fields.Selection( state = fields.Selection(
[('draft', "Draft"), ('subscribed', "Subscribed")], [('draft', "Draft"), ('subscribed', "Subscribed")],
string=u"State", required=True, default='draft') string=u"State", required=True, default='draft')
@ -205,33 +205,36 @@ class auditlog_rule(models.Model):
"""Instanciate a read method that log its calls.""" """Instanciate a read method that log its calls."""
# FIXME: read() seems a bit tricky, improve to handle old/new api # FIXME: read() seems a bit tricky, improve to handle old/new api
#@api.v7 # @api.v7
#def read(self, cr, user, ids, fields=None, context=None, load='_classic_read', **kwargs): # def read(self, cr, user, ids, fields=None, context=None,
# print "LOG READ", fields, load, kwargs # load='_classic_read', **kwargs):
# # avoid loops # print "LOG READ", fields, load, kwargs
# if self.env.context.get('auditlog_method_intercepted'): # # avoid loops
# return read.origin(self, cr, user, ids, fields, context, load, **kwargs) # if self.env.context.get('auditlog_method_intercepted'):
# # call original method with a modified context # return read.origin(
# context = dict(self.env.context, auditlog_method_intercepted=True) # self, cr, user, ids, fields, context, load, **kwargs)
# result = read.origin( # # call original method with a modified context
# self.with_context(context), # context = dict(
# cr, user, ids, fields, context, load, **kwargs) # self.env.context, auditlog_method_intercepted=True)
# print "RESULT", result # result = read.origin(
# return result # self.with_context(context),
# cr, user, ids, fields, context, load, **kwargs)
# print "RESULT", result
# return result
# @api.v8
#@api.v8 # def read(self, fields=None, load='_classic_read', **kwargs):
#def read(self, fields=None, load='_classic_read', **kwargs): # print "LOG READ", fields, load, kwargs
# print "LOG READ", fields, load, kwargs # # avoid loops
# # avoid loops # if self.env.context.get('auditlog_method_intercepted'):
# if self.env.context.get('auditlog_method_intercepted'): # return read.origin(self, fields, load, **kwargs)
# return read.origin(self, fields, load, **kwargs) # # call original method with a modified context
# # call original method with a modified context # context = dict(
# context = dict(self.env.context, auditlog_method_intercepted=True) # self.env.context, auditlog_method_intercepted=True)
# result = read.origin( # result = read.origin(
# self.with_context(context), fields, load, **kwargs) # self.with_context(context), fields, load, **kwargs)
# print "RESULT", result # print "RESULT", result
# return result # return result
def read(self, *args, **kwargs): def read(self, *args, **kwargs):
result = read.origin(self, *args, **kwargs) result = read.origin(self, *args, **kwargs)
@ -385,7 +388,8 @@ class auditlog_rule(models.Model):
act_window.unlink() act_window.unlink()
if value: if value:
ir_value = ir_values_model.search( ir_value = ir_values_model.search(
[('model', '=', rule.model_id.model), ('value', '=', value)]) [('model', '=', rule.model_id.model),
('value', '=', value)])
if ir_value: if ir_value:
ir_value.unlink() ir_value.unlink()
self.write({'state': 'draft'}) self.write({'state': 'draft'})