diff --git a/auditlog/models/rule.py b/auditlog/models/rule.py index e188eaf44..03bffbb85 100644 --- a/auditlog/models/rule.py +++ b/auditlog/models/rule.py @@ -72,7 +72,7 @@ class AuditlogRule(models.Model): u"Log Creates", default=True, help=(u"Select this if you want to keep track of creation on any " u"record of the model of this rule")) - log_custom = fields.Boolean( + log_custom_method = fields.Boolean( u"Log Methods", help=(u"Select this if you want to keep track of custom methods on " u"any record of the model of this rule")) @@ -162,7 +162,7 @@ class AuditlogRule(models.Model): updated = True # Check if custom methods are enabled and patch the different # rule methods - if getattr(rule, 'log_custom'): + if getattr(rule, 'log_custom_method'): for custom_method in rule.custom_method_ids: check_attr = 'auditlog_ruled_%s' % custom_method.name @@ -196,7 +196,7 @@ class AuditlogRule(models.Model): getattr(model_model, method), 'origin'): model_model._revert_method(method) updated = True - if hasattr(rule, 'log_custom'): + if hasattr(rule, 'log_custom_method'): for custom_method in rule.custom_method_ids: method = custom_method.name if hasattr(getattr(model_model, method), 'origin'): diff --git a/auditlog/tests/test_auditlog.py b/auditlog/tests/test_auditlog.py index 3373e6e87..225624584 100644 --- a/auditlog/tests/test_auditlog.py +++ b/auditlog/tests/test_auditlog.py @@ -140,7 +140,7 @@ class TestMethods(TransactionCase): 'log_create': False, 'log_write': False, 'log_unlink': False, - 'log_custom': True, + 'log_custom_method': True, 'custom_method_ids': [(0, 0, { 'name': 'copy', 'message': 'execute_copy', diff --git a/auditlog/views/auditlog_view.xml b/auditlog/views/auditlog_view.xml index 779dd36ec..9f502bf70 100644 --- a/auditlog/views/auditlog_view.xml +++ b/auditlog/views/auditlog_view.xml @@ -34,14 +34,14 @@ - + - + -
+
You can only edit custom methods when the rule is unsubscribed.
@@ -76,7 +76,7 @@ - +