Login required on modals

* adds new login_required_modal decorator
    * can be used before regular login_required decorator to return a proper session-timed-out message

intervention/views/compensation.py

@@ -12,11 +12,12 @@ from django.shortcuts import get_object_or_404
 from django.urls import reverse
 
 from intervention.models import Intervention
-from konova.decorators import shared_access_required
+from konova.decorators import shared_access_required, login_required_modal
 from konova.forms.modals import RemoveModalForm
 from konova.utils.message_templates import COMPENSATION_REMOVED_TEMPLATE
 
 
+@login_required_modal
 @login_required
 @shared_access_required(Intervention, "id")
 def remove_compensation_view(request: HttpRequest, id: str, comp_id: str):

intervention/views/intervention.py

@@ -16,7 +16,7 @@ from intervention.forms.intervention import EditInterventionForm, NewInterventio
 from intervention.models import Intervention
 from intervention.tables import InterventionTable
 from konova.contexts import BaseContext
-from konova.decorators import default_group_required, shared_access_required, any_group_check
+from konova.decorators import default_group_required, shared_access_required, any_group_check, login_required_modal
 from konova.forms import SimpleGeomForm
 from konova.forms.modals import RemoveModalForm
 from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
@@ -228,6 +228,7 @@ def edit_view(request: HttpRequest, id: str):
     return render(request, template, context)
 
 
+@login_required_modal
 @login_required
 @default_group_required
 @shared_access_required(Intervention, "id")

intervention/views/resubmission.py

@@ -9,7 +9,7 @@ from django.contrib.auth.decorators import login_required
 from django.utils.decorators import method_decorator
 
 from intervention.models import Intervention
-from konova.decorators import default_group_required, shared_access_required
+from konova.decorators import default_group_required, shared_access_required, login_required_modal
 from konova.views.resubmission import AbstractResubmissionView
 
 
@@ -18,6 +18,7 @@ class InterventionResubmissionView(AbstractResubmissionView):
     redirect_url_base = "intervention:detail"
     form_action_url_base = "intervention:resubmission-create"
 
+    @method_decorator(login_required_modal)
     @method_decorator(login_required)
     @method_decorator(default_group_required)
     @method_decorator(shared_access_required(Intervention, "id"))

intervention/views/revocation.py

@@ -14,7 +14,7 @@ from django.urls import reverse
 from intervention.forms.modals.revocation import NewRevocationModalForm, EditRevocationModalForm, \
     RemoveRevocationModalForm
 from intervention.models import Intervention, RevocationDocument, Revocation
-from konova.decorators import default_group_required, shared_access_required
+from konova.decorators import default_group_required, shared_access_required, login_required_modal
 from konova.utils.documents import get_document
 from konova.utils.message_templates import REVOCATION_ADDED, DATA_UNSHARED, REVOCATION_EDITED, REVOCATION_REMOVED
 
@@ -91,6 +91,7 @@ def edit_revocation_view(request: HttpRequest, id: str, revocation_id: str):
     )
 
 
+@login_required_modal
 @login_required
 @default_group_required
 @shared_access_required(Intervention, "id")

intervention/views/share.py

@@ -9,7 +9,7 @@ from django.contrib.auth.decorators import login_required
 from django.utils.decorators import method_decorator
 
 from intervention.models import Intervention
-from konova.decorators import default_group_required, shared_access_required
+from konova.decorators import default_group_required, shared_access_required, login_required_modal
 from konova.views.share import AbstractShareByTokenView, AbstractShareFormView
 
 
@@ -25,6 +25,7 @@ class InterventionShareByTokenView(AbstractShareByTokenView):
 class InterventionShareFormView(AbstractShareFormView):
     model = Intervention
 
+    @method_decorator(login_required_modal)
     @method_decorator(login_required)
     @method_decorator(default_group_required)
     @method_decorator(shared_access_required(Intervention, "id"))