|
|
@ -1,6 +1,7 @@ |
|
|
import inspect |
|
|
import inspect |
|
|
import logging |
|
|
import logging |
|
|
|
|
|
|
|
|
|
|
|
from django.conf import settings |
|
|
from django.core import serializers |
|
|
from django.core import serializers |
|
|
from django.db.models.signals import post_delete, post_save |
|
|
from django.db.models.signals import post_delete, post_save |
|
|
from django.dispatch import receiver |
|
|
from django.dispatch import receiver |
|
|
@ -55,16 +56,16 @@ def audit_log_function(sender, **kwargs): |
|
|
|
|
|
|
|
|
u = None |
|
|
u = None |
|
|
for i in inspect.stack(): |
|
|
for i in inspect.stack(): |
|
|
request = i.frame.f_locals.get('request', None) |
|
|
r = i.frame.f_locals.get('request', None) |
|
|
if request: |
|
|
try: |
|
|
u = request.user |
|
|
if r and \ |
|
|
break |
|
|
r.user._meta.label == settings.AUTH_USER_MODEL: |
|
|
else: |
|
|
u = r.user |
|
|
self_request = i.frame.f_locals.get('self', None) |
|
|
|
|
|
if hasattr(self_request, 'request'): |
|
|
|
|
|
u = self_request.request.user |
|
|
|
|
|
break |
|
|
break |
|
|
|
|
|
except: |
|
|
|
|
|
pass |
|
|
|
|
|
|
|
|
|
|
|
try: |
|
|
instance = kwargs.get('instance') |
|
|
instance = kwargs.get('instance') |
|
|
operation = kwargs.get('operation') |
|
|
operation = kwargs.get('operation') |
|
|
user = u |
|
|
user = u |
|
|
@ -81,7 +82,6 @@ def audit_log_function(sender, **kwargs): |
|
|
else: |
|
|
else: |
|
|
username = '' |
|
|
username = '' |
|
|
|
|
|
|
|
|
try: |
|
|
|
|
|
AuditLog.objects.create(username=username, |
|
|
AuditLog.objects.create(username=username, |
|
|
operation=operation, |
|
|
operation=operation, |
|
|
model_name=model_name, |
|
|
model_name=model_name, |
|
|
|