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

Apply 6 suggestion(s) to 1 file(s)

parent 9b01a5bb
No related branches found
No related tags found
1 merge request!108Set user in revisions to allow further tracking
Pipeline #4745 passed
...@@ -12,7 +12,6 @@ from django.views.generic import DetailView ...@@ -12,7 +12,6 @@ from django.views.generic import DetailView
import reversion import reversion
from calendarweek import CalendarWeek from calendarweek import CalendarWeek
from django_tables2 import SingleTableView from django_tables2 import SingleTableView
from reversion import set_user
from reversion.views import RevisionMixin from reversion.views import RevisionMixin
from rules.contrib.views import PermissionRequiredMixin, permission_required from rules.contrib.views import PermissionRequiredMixin, permission_required
...@@ -122,7 +121,7 @@ def lesson( ...@@ -122,7 +121,7 @@ def lesson(
"alsijil.edit_lessondocumentation", lesson_period "alsijil.edit_lessondocumentation", lesson_period
): ):
with reversion.create_revision(): with reversion.create_revision():
set_user(request.user) 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."))
...@@ -136,7 +135,7 @@ def lesson( ...@@ -136,7 +135,7 @@ def lesson(
"alsijil.edit_lesson_personalnote", lesson_period "alsijil.edit_lesson_personalnote", lesson_period
): ):
with reversion.create_revision(): with reversion.create_revision():
set_user(request.user) 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
...@@ -565,7 +564,7 @@ def overview_person(request: HttpRequest, id_: Optional[int] = None) -> HttpResp ...@@ -565,7 +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():
set_user(request.user) 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."))
...@@ -581,7 +580,7 @@ def overview_person(request: HttpRequest, id_: Optional[int] = None) -> HttpResp ...@@ -581,7 +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():
set_user(request.user) 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):
...@@ -717,7 +716,7 @@ class DeletePersonalNoteView(PermissionRequiredMixin, DetailView): ...@@ -717,7 +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():
set_user(request.user) 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