ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-06-21 09:58:23 +02:00
Code Issues Releases Wiki Activity

Logging is finally processed at post saved, but old instance is querried

Browse Source
This commit is contained in:
Yohann D'ANELLO
2020-02-27 16:25:18 +01:00
parent bcee5f8f2f
commit 9cd050e2f0
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/logs/signals.py
View File

@ -5,7 +5,7 @@ import inspect
from django.contrib.contenttypes.models import ContentType
from django.core import serializers
from django.db.models.signals import pre_save, pre_delete
from django.db.models.signals import pre_save, post_save, post_delete
from django.dispatch import receiver
from .models import Changelog
@ -58,22 +58,32 @@ EXCLUDED = [
'reversion.version',
]
@receiver(pre_save)
def pre_save_object(sender, instance, **kwargs):
qs = sender.objects.filter(pk=instance.pk).all()
if qs.exists():
instance._previous = qs.get()
else:
instance._previous = None
@receiver(post_save)
def save_object(sender, instance, **kwargs):
# noinspection PyProtectedMember
if instance._meta.label_lower in EXCLUDED:
return
previous = sender.objects.filter(pk=instance.pk).all()
previous = instance._previous
user, ip = get_user_and_ip(sender)
if user is not None and instance._meta.label_lower == "auth.user" and previous.exists():
if user is not None and instance._meta.label_lower == "auth.user" and previous:
# Don't save last login modifications
if instance.last_login != previous.get().last_login:
if instance.last_login != previous.last_login:
return
previous_json = serializers.serialize('json', previous)[1:-1] if previous.exists() else None
previous_json = serializers.serialize('json', [previous, ])[1:-1] if previous else None
instance_json = serializers.serialize('json', [instance, ])[1:-1]
if previous_json == instance_json:
@ -86,11 +96,11 @@ def save_object(sender, instance, **kwargs):
instance_pk=instance.pk,
previous=previous_json,
data=instance_json,
action=("edit" if previous.exists() else "create")
action=("edit" if previous else "create")
).save()
@receiver(pre_delete)
@receiver(post_delete)
def delete_object(sender, instance, **kwargs):
# noinspection PyProtectedMember
if instance._meta.label_lower in EXCLUDED: