Skip to content

Commit 0535a11

Browse files
authored
fix(auth): prevent null data in log entries and pass request to password reset (#1134)
1 parent b93d807 commit 0535a11

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

app/eventyay/base/models/auth.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -647,8 +647,8 @@ def log_action(self, action: str, data: dict = None, user=None, person=None, org
647647
"""
648648
from eventyay.base.models.log import LogEntry
649649

650-
if data:
651-
data = json.dumps(data)
650+
if data is None:
651+
data = {}
652652

653653
LogEntry.objects.create(
654654
user=user or person or self,

app/eventyay/control/views/users.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def get(self, request, *args, **kwargs):
118118
def post(self, request, *args, **kwargs):
119119
self.object = get_object_or_404(User, pk=self.kwargs.get('id'))
120120
try:
121-
self.object.send_password_reset()
121+
self.object.send_password_reset(request)
122122
except SendMailException:
123123
messages.error(
124124
request,

0 commit comments

Comments
 (0)