# Remove View refactoring

* refactors remove view for kom, eiv, oek and ema
* introduces BaseRemoveModalFormView
* moves html blocking logic from BaseModalForm into BaseModalFormView

ema/urls.py

@@ -10,8 +10,8 @@ from django.urls import path
 from ema.views.action import NewEmaActionView, EditEmaActionView, RemoveEmaActionView
 from ema.views.deadline import NewEmaDeadlineView, EditEmaDeadlineView, RemoveEmaDeadlineView
 from ema.views.document import NewEmaDocumentView, EditEmaDocumentView, RemoveEmaDocumentView, GetEmaDocumentView
-from ema.views.ema import remove_view, EmaIndexView, \
-    EmaIdentifierGeneratorView, EmaDetailView, EditEmaFormView, NewEmaFormView
+from ema.views.ema import EmaIndexView, EmaIdentifierGeneratorView, EmaDetailView, EditEmaFormView, NewEmaFormView, \
+    RemoveEmaView
 from ema.views.log import EmaLogView
 from ema.views.record import EmaRecordView
 from ema.views.report import EmaReportView
@@ -27,7 +27,7 @@ urlpatterns = [
     path("<id>", EmaDetailView.as_view(), name="detail"),
     path('<id>/log', EmaLogView.as_view(), name='log'),
     path('<id>/edit', EditEmaFormView.as_view(), name='edit'),
-    path('<id>/remove', remove_view, name='remove'),
+    path('<id>/remove', RemoveEmaView.as_view(), name='remove'),
     path('<id>/record', EmaRecordView.as_view(), name='record'),
     path('<id>/report', EmaReportView.as_view(), name='report'),
     path('<id>/resub', EmaResubmissionView.as_view(), name='resubmission-create'),

ema/views/ema.py

@@ -5,21 +5,17 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpRequest
 from django.shortcuts import get_object_or_404
-from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
 from ema.forms import NewEmaForm, EditEmaForm
 from ema.models import Ema
 from ema.tables import EmaTable
-from konova.decorators import shared_access_required, conservation_office_group_required, login_required_modal
-from konova.forms.modals import RemoveModalForm
 from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView, BaseNewSpatialLocatedObjectFormView, \
     BaseEditSpatialLocatedObjectFormView
 from konova.views.detail import BaseDetailView
+from konova.views.remove import BaseRemoveModalFormView
 
 
 class EmaIndexView(LoginRequiredMixin, BaseIndexView):
@@ -112,26 +108,9 @@ class EmaDetailView(BaseDetailView):
         }
         return context
 
+class RemoveEmaView(LoginRequiredMixin, BaseRemoveModalFormView):
+    _MODEL_CLS = Ema
+    _REDIRECT_URL = "ema:index"
 
-@login_required_modal
-@login_required
-@conservation_office_group_required
-@shared_access_required(Ema, "id")
-def remove_view(request: HttpRequest, id: str):
-    """ Renders a modal view for removing the EMA
-
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The EMA's id
-
-    Returns:
-
-    """
-    ema = get_object_or_404(Ema, id=id)
-    form = RemoveModalForm(request.POST or None, instance=ema, request=request)
-    return form.process_request(
-        request=request,
-        msg_success=_("EMA removed"),
-        redirect_url=reverse("ema:index"),
-    )
-
+    def _user_has_permission(self, user):
+        return user.is_ets_user()