Skip to content
Snippets Groups Projects
Commit cf3182ab authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'fix/set-user-revisions' into 'master'

Set user in revisions to allow further tracking

See merge request !108
parents 3cc04ff9 756ad20c
No related branches found
No related tags found
1 merge request!108Set user in revisions to allow further tracking
Pipeline #4800 passed
...@@ -7,6 +7,8 @@ from django.utils.translation import gettext as _ ...@@ -7,6 +7,8 @@ from django.utils.translation import gettext as _
import reversion import reversion
from calendarweek import CalendarWeek from calendarweek import CalendarWeek
from django_global_request.middleware import get_request
from reversion import set_user
from aleksis.apps.chronos.models import LessonPeriod from aleksis.apps.chronos.models import LessonPeriod
from aleksis.core.models import Group, Person from aleksis.core.models import Group, Person
...@@ -55,6 +57,7 @@ def mark_absent( ...@@ -55,6 +57,7 @@ def mark_absent(
continue continue
with reversion.create_revision(): with reversion.create_revision():
set_user(get_request().user)
personal_note, created = ( personal_note, created = (
PersonalNote.objects.select_related(None) PersonalNote.objects.select_related(None)
.prefetch_related(None) .prefetch_related(None)
......
...@@ -121,6 +121,7 @@ def lesson( ...@@ -121,6 +121,7 @@ def lesson(
"alsijil.edit_lessondocumentation", lesson_period "alsijil.edit_lessondocumentation", lesson_period
): ):
with reversion.create_revision(): with reversion.create_revision():
reversion.set_user(request.user)
lesson_documentation_form.save() lesson_documentation_form.save()
messages.success(request, _("The lesson documentation has been saved.")) messages.success(request, _("The lesson documentation has been saved."))
...@@ -134,6 +135,7 @@ def lesson( ...@@ -134,6 +135,7 @@ def lesson(
"alsijil.edit_lesson_personalnote", lesson_period "alsijil.edit_lesson_personalnote", lesson_period
): ):
with reversion.create_revision(): with reversion.create_revision():
reversion.set_user(request.user)
instances = personal_note_formset.save() instances = personal_note_formset.save()
# Iterate over personal notes and carry changed absences to following lessons # Iterate over personal notes and carry changed absences to following lessons
...@@ -562,6 +564,7 @@ def overview_person(request: HttpRequest, id_: Optional[int] = None) -> HttpResp ...@@ -562,6 +564,7 @@ def overview_person(request: HttpRequest, id_: Optional[int] = None) -> HttpResp
note.excused = True note.excused = True
note.excuse_type = excuse_type note.excuse_type = excuse_type
with reversion.create_revision(): with reversion.create_revision():
reversion.set_user(request.user)
note.save() note.save()
messages.success(request, _("The absences have been marked as excused.")) messages.success(request, _("The absences have been marked as excused."))
...@@ -577,6 +580,7 @@ def overview_person(request: HttpRequest, id_: Optional[int] = None) -> HttpResp ...@@ -577,6 +580,7 @@ def overview_person(request: HttpRequest, id_: Optional[int] = None) -> HttpResp
note.excused = True note.excused = True
note.excuse_type = excuse_type note.excuse_type = excuse_type
with reversion.create_revision(): with reversion.create_revision():
reversion.set_user(request.user)
note.save() note.save()
messages.success(request, _("The absence has been marked as excused.")) messages.success(request, _("The absence has been marked as excused."))
except (PersonalNote.DoesNotExist, ValueError): except (PersonalNote.DoesNotExist, ValueError):
...@@ -712,6 +716,7 @@ class DeletePersonalNoteView(PermissionRequiredMixin, DetailView): ...@@ -712,6 +716,7 @@ class DeletePersonalNoteView(PermissionRequiredMixin, DetailView):
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
note = self.get_object() note = self.get_object()
with reversion.create_revision(): with reversion.create_revision():
reversion.set_user(request.user)
note.reset_values() note.reset_values()
note.save() note.save()
messages.success(request, _("The personal note has been deleted.")) messages.success(request, _("The personal note has been deleted."))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment