Skip to content

Commit e6d6360

Browse files
valentijnscholtenvalentijnscholten
committed
remove more references
1 parent ef2f408 commit e6d6360

7 files changed

Lines changed: 7 additions & 151 deletions

File tree

‎dojo/endpoint/signals.py‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import contextlib
22

3-
from auditlog.models import LogEntry
43
from django.conf import settings
54
from django.contrib.auth import get_user_model
6-
from django.contrib.contenttypes.models import ContentType
75
from django.db.models.signals import post_delete
86
from django.dispatch import receiver
97
from django.urls import reverse
@@ -23,7 +21,7 @@ def endpoint_post_delete(sender, instance, using, origin, **kwargs):
2321
user = None
2422

2523
if settings.ENABLE_AUDITLOG:
26-
# First try to find deletion author in pghistory events
24+
# Find deletion author in pghistory events
2725
# Look for delete events for this specific endpoint instance
2826
pghistory_delete_events = DojoEvents.objects.filter(
2927
pgh_obj_model="dojo.Endpoint",
@@ -39,15 +37,6 @@ def endpoint_post_delete(sender, instance, using, origin, **kwargs):
3937
with contextlib.suppress(User.DoesNotExist):
4038
user = User.objects.get(id=latest_delete.user)
4139

42-
# Fall back to django-auditlog if no user found in pghistory
43-
if not user:
44-
if le := LogEntry.objects.filter(
45-
action=LogEntry.Action.DELETE,
46-
content_type=ContentType.objects.get(app_label="dojo", model="endpoint"),
47-
object_id=instance.id,
48-
).order_by("-id").first():
49-
user = le.actor
50-
5140
# Update description with user if found
5241
if user:
5342
description = _('The endpoint "%(name)s" was deleted by %(user)s') % {

‎dojo/engagement/signals.py‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import contextlib
22

3-
from auditlog.models import LogEntry
43
from django.conf import settings
54
from django.contrib.auth import get_user_model
6-
from django.contrib.contenttypes.models import ContentType
75
from django.db.models.signals import post_delete, post_save, pre_delete, pre_save
86
from django.dispatch import receiver
97
from django.urls import reverse
@@ -50,7 +48,7 @@ def engagement_post_delete(sender, instance, using, origin, **kwargs):
5048
user = None
5149

5250
if settings.ENABLE_AUDITLOG:
53-
# First try to find deletion author in pghistory events
51+
# Find deletion author in pghistory events
5452
# Look for delete events for this specific engagement instance
5553
pghistory_delete_events = DojoEvents.objects.filter(
5654
pgh_obj_model="dojo.Engagement",
@@ -66,15 +64,6 @@ def engagement_post_delete(sender, instance, using, origin, **kwargs):
6664
with contextlib.suppress(User.DoesNotExist):
6765
user = User.objects.get(id=latest_delete.user)
6866

69-
# Fall back to django-auditlog if no user found in pghistory
70-
if not user:
71-
if le := LogEntry.objects.filter(
72-
action=LogEntry.Action.DELETE,
73-
content_type=ContentType.objects.get(app_label="dojo", model="engagement"),
74-
object_id=instance.id,
75-
).order_by("-id").first():
76-
user = le.actor
77-
7867
# Update description with user if found
7968
if user:
8069
description = _('The engagement "%(name)s" was deleted by %(user)s') % {

‎dojo/finding_group/signals.py‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import contextlib
22

3-
from auditlog.models import LogEntry
43
from django.conf import settings
54
from django.contrib.auth import get_user_model
6-
from django.contrib.contenttypes.models import ContentType
75
from django.db.models.signals import post_delete
86
from django.dispatch import receiver
97
from django.urls import reverse
@@ -21,7 +19,7 @@ def finding_group_post_delete(sender, instance, using, origin, **kwargs):
2119
user = None
2220

2321
if settings.ENABLE_AUDITLOG:
24-
# First try to find deletion author in pghistory events
22+
# Find deletion author in pghistory events
2523
# Look for delete events for this specific finding_group instance
2624
pghistory_delete_events = DojoEvents.objects.filter(
2725
pgh_obj_model="dojo.Finding_Group",
@@ -37,15 +35,6 @@ def finding_group_post_delete(sender, instance, using, origin, **kwargs):
3735
with contextlib.suppress(User.DoesNotExist):
3836
user = User.objects.get(id=latest_delete.user)
3937

40-
# Fall back to django-auditlog if no user found in pghistory
41-
if not user:
42-
if le := LogEntry.objects.filter(
43-
action=LogEntry.Action.DELETE,
44-
content_type=ContentType.objects.get(app_label="dojo", model="finding_group"),
45-
object_id=instance.id,
46-
).order_by("-id").first():
47-
user = le.actor
48-
4938
# Update description with user if found
5039
if user:
5140
description = _('The finding group "%(name)s" was deleted by %(user)s') % {

‎dojo/management/commands/stamp_finding_last_reviewed.py‎

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎dojo/product/signals.py‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import contextlib
22

3-
from auditlog.models import LogEntry
43
from django.conf import settings
54
from django.contrib.auth import get_user_model
6-
from django.contrib.contenttypes.models import ContentType
75
from django.db.models.signals import post_delete, post_save
86
from django.dispatch import receiver
97
from django.urls import reverse
@@ -37,7 +35,7 @@ def product_post_delete(sender, instance, **kwargs):
3735
user = None
3836

3937
if settings.ENABLE_AUDITLOG:
40-
# First try to find deletion author in pghistory events
38+
# Find deletion author in pghistory events
4139
# Look for delete events for this specific product instance
4240
pghistory_delete_events = DojoEvents.objects.filter(
4341
pgh_obj_model="dojo.Product",
@@ -53,15 +51,7 @@ def product_post_delete(sender, instance, **kwargs):
5351
with contextlib.suppress(User.DoesNotExist):
5452
user = User.objects.get(id=latest_delete.user)
5553

56-
# Fall back to django-auditlog if no user found in pghistory
57-
if not user:
58-
if le := LogEntry.objects.filter(
59-
action=LogEntry.Action.DELETE,
60-
content_type=ContentType.objects.get(app_label="dojo", model="product"),
61-
object_id=instance.id,
62-
).order_by("-id").first():
63-
user = le.actor
64-
54+
# Fallback to the current user of the request (Which might be not available for ASYNC_OBJECT_DELETE scenario's)
6555
if not user:
6656
current_user = get_current_user()
6757
user = current_user

‎dojo/product_type/signals.py‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import contextlib
22

3-
from auditlog.models import LogEntry
43
from crum import get_current_user
54
from django.conf import settings
65
from django.contrib.auth import get_user_model
7-
from django.contrib.contenttypes.models import ContentType
86
from django.db.models.signals import post_delete, post_save
97
from django.dispatch import receiver
108
from django.urls import reverse
@@ -37,7 +35,7 @@ def product_type_post_delete(sender, instance, **kwargs):
3735
user = None
3836

3937
if settings.ENABLE_AUDITLOG:
40-
# First try to find deletion author in pghistory events
38+
# Find deletion author in pghistory events
4139
# Look for delete events for this specific product_type instance
4240
pghistory_delete_events = DojoEvents.objects.filter(
4341
pgh_obj_model="dojo.Product_Type",
@@ -53,16 +51,6 @@ def product_type_post_delete(sender, instance, **kwargs):
5351
with contextlib.suppress(User.DoesNotExist):
5452
user = User.objects.get(id=latest_delete.user)
5553

56-
# Fall back to django-auditlog if no user found in pghistory
57-
if not user:
58-
if le := LogEntry.objects.filter(
59-
action=LogEntry.Action.DELETE,
60-
content_type=ContentType.objects.get(app_label="dojo", model="product_type"),
61-
object_id=instance.id,
62-
).order_by("-id").first():
63-
user = le.actor
64-
65-
# Since adding pghistory as auditlog option, this signal here runs before the django-auditlog signal
6654
# Fallback to the current user of the request (Which might be not available for ASYNC_OBJECT_DELETE scenario's)
6755
if not user:
6856
current_user = get_current_user()

‎dojo/test/signals.py‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import contextlib
22

3-
from auditlog.models import LogEntry
43
from django.conf import settings
54
from django.contrib.auth import get_user_model
6-
from django.contrib.contenttypes.models import ContentType
75
from django.db.models.signals import post_delete, pre_delete, pre_save
86
from django.dispatch import receiver
97
from django.urls import reverse
@@ -25,7 +23,7 @@ def test_post_delete(sender, instance, using, origin, **kwargs):
2523
user = None
2624

2725
if settings.ENABLE_AUDITLOG:
28-
# First try to find deletion author in pghistory events
26+
# Find deletion author in pghistory events
2927
# Look for delete events for this specific test instance
3028
pghistory_delete_events = DojoEvents.objects.filter(
3129
pgh_obj_model="dojo.Test",
@@ -41,15 +39,6 @@ def test_post_delete(sender, instance, using, origin, **kwargs):
4139
with contextlib.suppress(User.DoesNotExist):
4240
user = User.objects.get(id=latest_delete.user)
4341

44-
# Fall back to django-auditlog if no user found in pghistory
45-
if not user:
46-
if le := LogEntry.objects.filter(
47-
action=LogEntry.Action.DELETE,
48-
content_type=ContentType.objects.get(app_label="dojo", model="test"),
49-
object_id=instance.id,
50-
).order_by("-id").first():
51-
user = le.actor
52-
5342
# Update description with user if found
5443
if user:
5544
description = _('The test "%(name)s" was deleted by %(user)s') % {

0 commit comments

Comments
 (0)