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

compensation/views/compensation/action.py

@@ -14,7 +14,7 @@ from django.utils.decorators import method_decorator
 from compensation.forms.modals.compensation_action import RemoveCompensationActionModalForm, \
     EditCompensationActionModalForm, NewCompensationActionModalForm
 from compensation.models import Compensation, CompensationAction
-from konova.decorators import shared_access_required, default_group_required
+from konova.decorators import shared_access_required, default_group_required, login_required_modal
 from konova.utils.message_templates import COMPENSATION_ACTION_REMOVED, COMPENSATION_ACTION_EDITED, \
     COMPENSATION_ACTION_ADDED
 from konova.views.action import AbstractNewCompensationActionView, AbstractEditCompensationActionView, \
@@ -25,6 +25,7 @@ class NewCompensationActionView(AbstractNewCompensationActionView):
     model = Compensation
     redirect_url = "compensation:detail"
 
+    @method_decorator(login_required_modal)
     @method_decorator(login_required)
     @method_decorator(default_group_required)
     @method_decorator(shared_access_required(Compensation, "id"))
@@ -36,6 +37,7 @@ class EditCompensationActionView(AbstractEditCompensationActionView):
     model = Compensation
     redirect_url = "compensation:detail"
 
+    @method_decorator(login_required_modal)
     @method_decorator(login_required)
     @method_decorator(default_group_required)
     @method_decorator(shared_access_required(Compensation, "id"))
@@ -47,6 +49,7 @@ class RemoveCompensationActionView(AbstractRemoveCompensationActionView):
     model = Compensation
     redirect_url = "compensation:detail"
 
+    @method_decorator(login_required_modal)
     @method_decorator(login_required)
     @method_decorator(default_group_required)
     @method_decorator(shared_access_required(Compensation, "id"))

compensation/views/compensation/compensation.py

@@ -19,7 +19,7 @@ from compensation.models import Compensation
 from compensation.tables.compensation import CompensationTable
 from intervention.models import Intervention
 from konova.contexts import BaseContext
-from konova.decorators import shared_access_required, default_group_required, any_group_check
+from konova.decorators import shared_access_required, default_group_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
@@ -249,6 +249,7 @@ def detail_view(request: HttpRequest, id: str):
     return render(request, template, context)
 
 
+@login_required_modal
 @login_required
 @default_group_required
 @shared_access_required(Compensation, "id")

compensation/views/compensation/deadline.py

@@ -9,7 +9,7 @@ from django.contrib.auth.decorators import login_required
 from django.utils.decorators import method_decorator
 
 from compensation.models import Compensation
-from konova.decorators import shared_access_required, default_group_required
+from konova.decorators import shared_access_required, default_group_required, login_required_modal
 from konova.views.deadline import AbstractRemoveDeadlineView, AbstractEditDeadlineView, AbstractNewDeadlineView
 
 
@@ -17,6 +17,7 @@ class NewCompensationDeadlineView(AbstractNewDeadlineView):
     model = Compensation
     redirect_url = "compensation:detail"
 
+    @method_decorator(login_required_modal)
     @method_decorator(login_required)
     @method_decorator(default_group_required)
     @method_decorator(shared_access_required(Compensation, "id"))
@@ -28,6 +29,7 @@ class EditCompensationDeadlineView(AbstractEditDeadlineView):
     model = Compensation
     redirect_url = "compensation:detail"
 
+    @method_decorator(login_required_modal)
     @method_decorator(login_required)
     @method_decorator(default_group_required)
     @method_decorator(shared_access_required(Compensation, "id"))
@@ -39,6 +41,7 @@ class RemoveCompensationDeadlineView(AbstractRemoveDeadlineView):
     model = Compensation
     redirect_url = "compensation:detail"
 
+    @method_decorator(login_required_modal)
     @method_decorator(login_required)
     @method_decorator(default_group_required)
     @method_decorator(shared_access_required(Compensation, "id"))

compensation/views/compensation/document.py

@@ -10,7 +10,7 @@ from django.utils.decorators import method_decorator
 
 from compensation.forms.modals.document import NewCompensationDocumentModalForm
 from compensation.models import Compensation, CompensationDocument
-from konova.decorators import shared_access_required, default_group_required
+from konova.decorators import shared_access_required, default_group_required, login_required_modal
 from konova.forms.modals import EditDocumentModalForm
 from konova.views.document import AbstractNewDocumentView, AbstractGetDocumentView, AbstractRemoveDocumentView, \
     AbstractEditDocumentView
@@ -21,6 +21,7 @@ class NewCompensationDocumentView(AbstractNewDocumentView):
     form = NewCompensationDocumentModalForm
     redirect_url = "compensation:detail"
 
+    @method_decorator(login_required_modal)
     @method_decorator(login_required)
     @method_decorator(default_group_required)
     @method_decorator(shared_access_required(Compensation, "id"))
@@ -43,6 +44,7 @@ class RemoveCompensationDocumentView(AbstractRemoveDocumentView):
     model = Compensation
     document_model = CompensationDocument
 
+    @method_decorator(login_required_modal)
     @method_decorator(login_required)
     @method_decorator(default_group_required)
     @method_decorator(shared_access_required(Compensation, "id"))
@@ -56,6 +58,7 @@ class EditCompensationDocumentView(AbstractEditDocumentView):
     form = EditDocumentModalForm
     redirect_url = "compensation:detail"
 
+    @method_decorator(login_required_modal)
     @method_decorator(login_required)
     @method_decorator(default_group_required)
     @method_decorator(shared_access_required(Compensation, "id"))

compensation/views/compensation/log.py

@@ -9,13 +9,14 @@ from django.contrib.auth.decorators import login_required
 from django.utils.decorators import method_decorator
 
 from compensation.models import Compensation
-from konova.decorators import shared_access_required, default_group_required
+from konova.decorators import shared_access_required, default_group_required, login_required_modal
 from konova.views.log import AbstractLogView
 
 
 class CompensationLogView(AbstractLogView):
     model = Compensation
 
+    @method_decorator(login_required_modal)
     @method_decorator(login_required)
     @method_decorator(default_group_required)
     @method_decorator(shared_access_required(Compensation, "id"))

compensation/views/compensation/resubmission.py

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

compensation/views/compensation/state.py

@@ -9,7 +9,7 @@ from django.contrib.auth.decorators import login_required
 from django.utils.decorators import method_decorator
 
 from compensation.models import Compensation
-from konova.decorators import shared_access_required, default_group_required
+from konova.decorators import shared_access_required, default_group_required, login_required_modal
 from konova.views.state import AbstractNewCompensationStateView, AbstractEditCompensationStateView, \
     AbstractRemoveCompensationStateView
 
@@ -18,6 +18,7 @@ class NewCompensationStateView(AbstractNewCompensationStateView):
     model = Compensation
     redirect_url = "compensation:detail"
 
+    @method_decorator(login_required_modal)
     @method_decorator(login_required)
     @method_decorator(default_group_required)
     @method_decorator(shared_access_required(Compensation, "id"))
@@ -29,6 +30,7 @@ class EditCompensationStateView(AbstractEditCompensationStateView):
     model = Compensation
     redirect_url = "compensation:detail"
 
+    @method_decorator(login_required_modal)
     @method_decorator(login_required)
     @method_decorator(default_group_required)
     @method_decorator(shared_access_required(Compensation, "id"))
@@ -40,6 +42,7 @@ class RemoveCompensationStateView(AbstractRemoveCompensationStateView):
     model = Compensation
     redirect_url = "compensation:detail"
 
+    @method_decorator(login_required_modal)
     @method_decorator(login_required)
     @method_decorator(default_group_required)
     @method_decorator(shared_access_required(Compensation, "id"))