Share views

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

ema/models/ema.py

@@ -103,7 +103,7 @@ class Ema(AbstractCompensation, ShareableObjectMixin, RecordableObjectMixin, Pik
         Returns:
 
         """
-        return reverse("ema:share", args=(self.id, self.access_token))
+        return reverse("ema:share-token", args=(self.id, self.access_token))
 
 
 class EmaDocument(AbstractDocument):

ema/templates/ema/detail/includes/controls.html

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

ema/tests/test_views.py

@@ -49,8 +49,8 @@ class EmaViewTestCase(CompensationViewTestCase):
         self.log_url = reverse("ema:log", args=(self.ema.id,))
         self.edit_url = reverse("ema:edit", args=(self.ema.id,))
         self.remove_url = reverse("ema:remove", args=(self.ema.id,))
-        self.share_url = reverse("ema:share", args=(self.ema.id, self.ema.access_token,))
-        self.share_create_url = reverse("ema:share-create", args=(self.ema.id,))
+        self.share_url = reverse("ema:share-token", args=(self.ema.id, self.ema.access_token,))
+        self.share_create_url = reverse("ema:share-form", args=(self.ema.id,))
         self.record_url = reverse("ema:record", args=(self.ema.id,))
         self.report_url = reverse("ema:report", args=(self.ema.id,))
         self.new_doc_url = reverse("ema:new-doc", args=(self.ema.id,))

ema/urls.py

@@ -15,7 +15,7 @@ from ema.views.log import EmaLogView
 from ema.views.record import EmaRecordView
 from ema.views.report import report_view
 from ema.views.resubmission import EmaResubmissionView
-from ema.views.share import share_view, create_share_view
+from ema.views.share import EmaShareFormView, EmaShareByTokenView
 from ema.views.state import NewEmaStateView, EditEmaStateView, RemoveEmaStateView
 
 app_name = "ema"
@@ -43,8 +43,8 @@ urlpatterns = [
     path('<id>/deadline/<deadline_id>/edit', EditEmaDeadlineView.as_view(), name='deadline-edit'),
     path('<id>/deadline/<deadline_id>/remove', RemoveEmaDeadlineView.as_view(), name='deadline-remove'),
 
-    path('<id>/share/<token>', share_view, name='share'),
-    path('<id>/share', create_share_view, name='share-create'),
+    path('<id>/share/<token>', EmaShareByTokenView.as_view(), name='share-token'),
+    path('<id>/share', EmaShareFormView.as_view(), name='share-form'),
 
     # Documents
     path('<id>/document/new/', NewEmaDocumentView.as_view(), name='new-doc'),

ema/views/share.py

@@ -5,73 +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 ema.models import Ema
-from intervention.forms.modals.share import ShareModalForm
 from konova.decorators import conservation_office_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 ema
+class EmaShareByTokenView(AbstractShareByTokenView):
+    model = Ema
+    redirect_url = "ema: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): EMA's id
-        token (str): Access token for EMA
-
-    Returns:
-
-    """
-    user = request.user
-    obj = get_object_or_404(Ema, id=id)
-    # Check tokens
-    if obj.access_token == token:
-        # Send different messages in case user has already been added to list of sharing users
-        if obj.is_shared_with(user):
-            messages.info(
-                request,
-                _("{} has already been shared with you").format(obj.identifier)
-            )
-        else:
-            messages.success(
-                request,
-                _("{} has been shared with you").format(obj.identifier)
-            )
-            obj.share_with_user(user)
-        return redirect("ema: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
-@conservation_office_group_required
-@shared_access_required(Ema, "id")
-def create_share_view(request: HttpRequest, id: str):
-    """ Renders sharing form for an Ema
+class EmaShareFormView(AbstractShareFormView):
+    model = Ema
 
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): Ema's id
-
-    Returns:
-
-    """
-    obj = get_object_or_404(Ema, id=id)
-    form = ShareModalForm(request.POST or None, instance=obj, request=request)
-    return form.process_request(
-        request,
-        msg_success=_("Share settings updated")
-    )
+    @method_decorator(login_required)
+    @method_decorator(conservation_office_group_required)
+    @method_decorator(shared_access_required(Ema, "id"))
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)