Share views

* replaces function based share views with class based
* improves team-share autocomplete search
* renames internal share url names

intervention/models/intervention.py

@@ -337,7 +337,7 @@ class Intervention(BaseObject,
         Returns:
 
         """
-        return reverse("intervention:share", args=(self.id, self.access_token))
+        return reverse("intervention:share-token", args=(self.id, self.access_token))
 
     def remove_payment(self, form):
         """ Removes a Payment from the intervention

intervention/templates/intervention/detail/includes/controls.html

@@ -15,7 +15,7 @@
         <button class="btn btn-default btn-modal mr-2" title="{% trans 'Resubmission' %}" data-form-url="{% url 'intervention:resubmission-create' obj.id %}">
             {% fa5_icon 'bell' %}
         </button>
-        <button class="btn btn-default btn-modal mr-2" title="{% trans 'Share' %}" data-form-url="{% url 'intervention:share-create' obj.id %}">
+        <button class="btn btn-default btn-modal mr-2" title="{% trans 'Share' %}" data-form-url="{% url 'intervention:share-form' obj.id %}">
             {% fa5_icon 'share-alt' %}
         </button>
         {% if is_zb_member %}

intervention/tests/test_views.py

@@ -31,8 +31,8 @@ class InterventionViewTestCase(BaseViewTestCase):
         self.log_url = reverse("intervention:log", args=(self.intervention.id,))
         self.edit_url = reverse("intervention:edit", args=(self.intervention.id,))
         self.remove_url = reverse("intervention:remove", args=(self.intervention.id,))
-        self.share_url = reverse("intervention:share", args=(self.intervention.id, self.intervention.access_token,))
-        self.share_create_url = reverse("intervention:share-create", args=(self.intervention.id,))
+        self.share_url = reverse("intervention:share-token", args=(self.intervention.id, self.intervention.access_token,))
+        self.share_create_url = reverse("intervention:share-form", args=(self.intervention.id,))
         self.run_check_url = reverse("intervention:check", args=(self.intervention.id,))
         self.record_url = reverse("intervention:record", args=(self.intervention.id,))
         self.report_url = reverse("intervention:report", args=(self.intervention.id,))

intervention/urls.py

@@ -21,7 +21,7 @@ from intervention.views.report import report_view
 from intervention.views.resubmission import InterventionResubmissionView
 from intervention.views.revocation import new_revocation_view, edit_revocation_view, remove_revocation_view, \
     get_revocation_view
-from intervention.views.share import share_view, create_share_view
+from intervention.views.share import InterventionShareFormView, InterventionShareByTokenView
 
 app_name = "intervention"
 urlpatterns = [
@@ -32,8 +32,8 @@ urlpatterns = [
     path('<id>/log', InterventionLogView.as_view(), name='log'),
     path('<id>/edit', edit_view, name='edit'),
     path('<id>/remove', remove_view, name='remove'),
-    path('<id>/share/<token>', share_view, name='share'),
-    path('<id>/share', create_share_view, name='share-create'),
+    path('<id>/share/<token>', InterventionShareByTokenView.as_view(), name='share-token'),
+    path('<id>/share', InterventionShareFormView.as_view(), name='share-form'),
     path('<id>/check', check_view, name='check'),
     path('<id>/record', InterventionRecordView.as_view(), name='record'),
     path('<id>/report', report_view, name='report'),

intervention/views/share.py

@@ -5,74 +5,28 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.http import HttpRequest
-from django.shortcuts import get_object_or_404, redirect
-from django.utils.translation import gettext_lazy as _
+from django.utils.decorators import method_decorator
 
-from intervention.forms.modals.share import ShareModalForm
 from intervention.models import Intervention
 from konova.decorators import default_group_required, shared_access_required
+from konova.views.share import AbstractShareByTokenView, AbstractShareFormView
 
 
-@login_required
-def share_view(request: HttpRequest, id: str, token: str):
-    """ Performs sharing of an intervention
+class InterventionShareByTokenView(AbstractShareByTokenView):
+    model = Intervention
+    redirect_url = "intervention:detail"
 
-    If token given in url is not valid, the user will be redirected to the dashboard
-
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): Intervention's id
-        token (str): Access token for intervention
-
-    Returns:
-
-    """
-    user = request.user
-    intervention = get_object_or_404(Intervention, id=id)
-    # Check tokens
-    if intervention.access_token == token:
-        # Send different messages in case user has already been added to list of sharing users
-        if intervention.is_shared_with(user):
-            messages.info(
-                request,
-                _("{} has already been shared with you").format(intervention.identifier)
-            )
-        else:
-            messages.success(
-                request,
-                _("{} has been shared with you").format(intervention.identifier)
-            )
-            intervention.share_with_user(user)
-        return redirect("intervention:detail", id=id)
-    else:
-        messages.error(
-            request,
-            _("Share link invalid"),
-            extra_tags="danger",
-        )
-        return redirect("home")
+    @method_decorator(login_required)
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)
 
 
-@login_required
-@default_group_required
-@shared_access_required(Intervention, "id")
-def create_share_view(request: HttpRequest, id: str):
-    """ Renders sharing form for an intervention
-
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): Intervention's id
-
-    Returns:
-
-    """
-    intervention = get_object_or_404(Intervention, id=id)
-    form = ShareModalForm(request.POST or None, instance=intervention, request=request)
-    return form.process_request(
-        request,
-        msg_success=_("Share settings updated")
-    )
+class InterventionShareFormView(AbstractShareFormView):
+    model = Intervention
 
+    @method_decorator(login_required)
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)