Share views

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

compensation/models/eco_account.py

@@ -160,7 +160,7 @@ class EcoAccount(AbstractCompensation, ShareableObjectMixin, RecordableObjectMix
         Returns:
 
         """
-        return reverse("compensation:acc:share", args=(self.id, self.access_token))
+        return reverse("compensation:acc:share-token", args=(self.id, self.access_token))
 
     def send_notification_mail_on_deduction_change(self, data_change: dict):
         """ Sends notification mails for changes on the deduction

compensation/templates/compensation/detail/eco_account/includes/controls.html

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

compensation/urls/eco_account.py

@@ -20,7 +20,7 @@ from compensation.views.eco_account.action import NewEcoAccountActionView, EditE
     RemoveEcoAccountActionView
 from compensation.views.eco_account.deadline import NewEcoAccountDeadlineView, EditEcoAccountDeadlineView, \
     RemoveEcoAccountDeadlineView
-from compensation.views.eco_account.share import share_view, create_share_view
+from compensation.views.eco_account.share import EcoAccountShareByTokenView, EcoAccountShareFormView
 from compensation.views.eco_account.document import GetEcoAccountDocumentView, NewEcoAccountDocumentView, \
     EditEcoAccountDocumentView, RemoveEcoAccountDocumentView
 from compensation.views.eco_account.deduction import NewEcoAccountDeductionView, EditEcoAccountDeductionView, \
@@ -51,8 +51,8 @@ urlpatterns = [
     path('<id>/deadline/<deadline_id>/edit', EditEcoAccountDeadlineView.as_view(), name='deadline-edit'),
     path('<id>/deadline/<deadline_id>/remove', RemoveEcoAccountDeadlineView.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>', EcoAccountShareByTokenView.as_view(), name='share-token'),
+    path('<id>/share', EcoAccountShareFormView.as_view(), name='share-form'),
 
     # Documents
     path('<id>/document/new/', NewEcoAccountDocumentView.as_view(), name='new-doc'),

compensation/views/eco_account/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 compensation.models import EcoAccount
-from intervention.forms.modals.share import ShareModalForm
 from konova.decorators import shared_access_required, default_group_required
+from konova.views.share import AbstractShareByTokenView, AbstractShareFormView
 
 
-@login_required
-def share_view(request: HttpRequest, id: str, token: str):
-    """ Performs sharing of an eco account
+class EcoAccountShareByTokenView(AbstractShareByTokenView):
+    model = EcoAccount
+    redirect_url = "compensation:acc: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): EcoAccount's id
-        token (str): Access token for EcoAccount
-
-    Returns:
-
-    """
-    user = request.user
-    obj = get_object_or_404(EcoAccount, 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("compensation:acc: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(EcoAccount, "id")
-def create_share_view(request: HttpRequest, id: str):
-    """ Renders sharing form for an eco account
-
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): EcoAccount's id
-
-    Returns:
-
-    """
-    obj = get_object_or_404(EcoAccount, id=id)
-    form = ShareModalForm(request.POST or None, instance=obj, request=request)
-    return form.process_request(
-        request,
-        msg_success=_("Share settings updated")
-    )
+class EcoAccountShareFormView(AbstractShareFormView):
+    model = EcoAccount
 
+    @method_decorator(login_required)
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(EcoAccount, "id"))
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)