Hopiu/django-auditlog
1
0
Fork 0
mirror of https://github.com/jazzband/django-auditlog.git synced 2026-03-16 22:20:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make LogEntry and middleware compatible with custom user models

Browse source
This commit is contained in:
Jan-Jelle Kester 2013-10-20 19:24:33 +02:00
parent 9a13a5966f
commit db8529b773
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
auditlog/middleware.py
View file

@ -1,3 +1,4 @@
from django.conf import settings
from django.db.models.signals import pre_save
from django.utils.functional import curry
from auditlog.models import LogEntry
@ -15,13 +16,13 @@ class AuditLogMiddleware(object):
else:
user = None
insert_user = curry(self.insert_user, user)
pre_save.connect(insert_user, sender=LogEntry, dispatch_uid=(self.__class__, request), weak=False)
set_actor = curry(self.set_actor, user)
pre_save.connect(set_actor, sender=LogEntry, dispatch_uid=(self.__class__, request), weak=False)
def process_response(self, request, response):
pre_save.disconnect(dispatch_uid=(self.__class__, request))
return response
def insert_user(self, user, sender, instance, **kwargs):
if sender == LogEntry and isinstance(instance, sender):
def set_actor(self, user, sender, instance, **kwargs):
if sender == LogEntry and isinstance(user, settings.AUTH_USER_MODEL):
instance.actor = user

3
auditlog/models.py
View file

@ -1,3 +1,4 @@
from django.conf import settings
from django.contrib.contenttypes import generic
from django.contrib.contenttypes.models import ContentType
from django.db import models
@ -49,7 +50,7 @@ class LogEntry(models.Model):
object_repr = models.TextField(verbose_name=_("object representation"))
action = models.PositiveSmallIntegerField(choices=Action.choices, verbose_name=_("action"))
changes = models.TextField(blank=True, verbose_name=_("change message"))
actor = models.ForeignKey('auth.User', blank=True, null=True, on_delete=models.SET_NULL, related_name='+', verbose_name=_("actor"))
actor = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, on_delete=models.SET_NULL, related_name='+', verbose_name=_("actor"))
timestamp = models.DateTimeField(auto_now_add=True, verbose_name=_("timestamp"))
class Meta: