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

auditlog - Field 'type' renamed to 'log_type'

pull/2268/head
sebalix 2016-02-13 14:12:46 +01:00 committed by BT-vgabor
parent 380e0f7e62
commit 3a55668d14
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auditlog/models/log.py
View File

@ -40,7 +40,7 @@ class AuditlogLog(models.Model):
'auditlog.http.session', string=u"Session") 'auditlog.http.session', string=u"Session")
http_request_id = fields.Many2one( http_request_id = fields.Many2one(
'auditlog.http.request', string=u"HTTP Request") 'auditlog.http.request', string=u"HTTP Request")
type = fields.Selection( log_type = fields.Selection(
[('full', u"Full log"), [('full', u"Full log"),
('fast', u"Fast log"), ('fast', u"Fast log"),
], ],

20
auditlog/models/rule.py
View File

@ -232,7 +232,7 @@ class AuditlogRule(models.Model):
.with_context(prefetch_fields=False).read(list(self._fields))) .with_context(prefetch_fields=False).read(list(self._fields)))
rule_model.sudo().create_logs( rule_model.sudo().create_logs(
self.env.uid, self._name, new_record.ids, self.env.uid, self._name, new_record.ids,
'create', None, new_values, {'type': log_type}) 'create', None, new_values, {'log_type': log_type})
return new_record return new_record
@api.model @api.model
@ -245,7 +245,7 @@ class AuditlogRule(models.Model):
new_values = {new_record.id: vals2} new_values = {new_record.id: vals2}
rule_model.sudo().create_logs( rule_model.sudo().create_logs(
self.env.uid, self._name, new_record.ids, self.env.uid, self._name, new_record.ids,
'create', None, new_values, {'type': log_type}) 'create', None, new_values, {'log_type': log_type})
return new_record return new_record
return create_full if self.log_type == 'full' else create_fast return create_full if self.log_type == 'full' else create_fast
@ -279,7 +279,7 @@ class AuditlogRule(models.Model):
rule_model = env['auditlog.rule'] rule_model = env['auditlog.rule']
rule_model.sudo().create_logs( rule_model.sudo().create_logs(
env.uid, self._name, ids, env.uid, self._name, ids,
'read', read_values, None, {'type': log_type}) 'read', read_values, None, {'log_type': log_type})
# New API # New API
else: else:
# If the call came from auditlog itself, skip logging: # If the call came from auditlog itself, skip logging:
@ -292,7 +292,7 @@ class AuditlogRule(models.Model):
rule_model = self.env['auditlog.rule'] rule_model = self.env['auditlog.rule']
rule_model.sudo().create_logs( rule_model.sudo().create_logs(
self.env.uid, self._name, self.ids, self.env.uid, self._name, self.ids,
'read', read_values, None, {'type': log_type}) 'read', read_values, None, {'log_type': log_type})
return result return result
return read return read
@ -315,7 +315,7 @@ class AuditlogRule(models.Model):
.with_context(prefetch_fields=False).read(list(self._fields))) .with_context(prefetch_fields=False).read(list(self._fields)))
rule_model.sudo().create_logs( rule_model.sudo().create_logs(
self.env.uid, self._name, self.ids, self.env.uid, self._name, self.ids,
'write', old_values, new_values, {'type': log_type}) 'write', old_values, new_values, {'log_type': log_type})
return result return result
@api.multi @api.multi
@ -332,7 +332,7 @@ class AuditlogRule(models.Model):
result = write_fast.origin(self, vals, **kwargs) result = write_fast.origin(self, vals, **kwargs)
rule_model.sudo().create_logs( rule_model.sudo().create_logs(
self.env.uid, self._name, self.ids, self.env.uid, self._name, self.ids,
'write', old_values, new_values, {'type': log_type}) 'write', old_values, new_values, {'log_type': log_type})
return result return result
return write_full if self.log_type == 'full' else write_fast return write_full if self.log_type == 'full' else write_fast
@ -352,7 +352,7 @@ class AuditlogRule(models.Model):
.with_context(prefetch_fields=False).read(list(self._fields))) .with_context(prefetch_fields=False).read(list(self._fields)))
rule_model.sudo().create_logs( rule_model.sudo().create_logs(
self.env.uid, self._name, self.ids, 'unlink', old_values, None, self.env.uid, self._name, self.ids, 'unlink', old_values, None,
{'type': log_type}) {'log_type': log_type})
return unlink_full.origin(self, **kwargs) return unlink_full.origin(self, **kwargs)
@api.multi @api.multi
@ -361,7 +361,7 @@ class AuditlogRule(models.Model):
rule_model = self.env['auditlog.rule'] rule_model = self.env['auditlog.rule']
rule_model.sudo().create_logs( rule_model.sudo().create_logs(
self.env.uid, self._name, self.ids, 'unlink', None, None, self.env.uid, self._name, self.ids, 'unlink', None, None,
{'type': log_type}) {'log_type': log_type})
return unlink_fast.origin(self, **kwargs) return unlink_fast.origin(self, **kwargs)
return unlink_full if self.log_type == 'full' else unlink_fast return unlink_full if self.log_type == 'full' else unlink_fast
@ -487,7 +487,7 @@ class AuditlogRule(models.Model):
'new_value_text': new_values[log.res_id][field['name']], 'new_value_text': new_values[log.res_id][field['name']],
} }
# for *2many fields, log the name_get # for *2many fields, log the name_get
if log.type == 'full' and field['relation'] \ if log.log_type == 'full' and field['relation'] \
and '2many' in field['ttype']: and '2many' in field['ttype']:
# Filter IDs to prevent a 'name_get()' call on deleted resources # Filter IDs to prevent a 'name_get()' call on deleted resources
existing_ids = self.env[field['relation']]._search( existing_ids = self.env[field['relation']]._search(
@ -533,7 +533,7 @@ class AuditlogRule(models.Model):
'new_value': new_values[log.res_id][field['name']], 'new_value': new_values[log.res_id][field['name']],
'new_value_text': new_values[log.res_id][field['name']], 'new_value_text': new_values[log.res_id][field['name']],
} }
if log.type == 'full' and field['relation'] \ if log.log_type == 'full' and field['relation'] \
and '2many' in field['ttype']: and '2many' in field['ttype']:
new_value_text = self.env[field['relation']].browse( new_value_text = self.env[field['relation']].browse(
vals['new_value']).name_get() vals['new_value']).name_get()

2
auditlog/views/auditlog_view.xml
View File

@ -112,7 +112,7 @@
<field name="create_date" readonly="1"/> <field name="create_date" readonly="1"/>
<field name="user_id" readonly="1"/> <field name="user_id" readonly="1"/>
<field name="method" readonly="1"/> <field name="method" readonly="1"/>
<field name="type" readonly="1"/> <field name="log_type" readonly="1"/>
</group> </group>
<group colspan="1"> <group colspan="1">
<field name="model_id" readonly="1"/> <field name="model_id" readonly="1"/>