From 40f11acd41da7086b74af80f8d87a279ee7a54aa Mon Sep 17 00:00:00 2001
From: Sebastian Gutzeit <sebastian.gutzeit@rostock.de>
Date: Wed, 14 Feb 2024 13:22:26 +0100
Subject: [PATCH] =?UTF-8?q?BEMAS:=20Verbesserungen=20Benutzerf=C3=BChrung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bemas/generic-objectclass-form.html       |  7 ++
 bemas/urls.py                                 | 15 ++--
 bemas/views/functions.py                      |  8 +-
 bemas/views/views_objectclass.py              | 73 +++++++------------
 4 files changed, 47 insertions(+), 56 deletions(-)

diff --git a/bemas/templates/bemas/generic-objectclass-form.html b/bemas/templates/bemas/generic-objectclass-form.html
index 48b8a3a3..cdce4ece 100644
--- a/bemas/templates/bemas/generic-objectclass-form.html
+++ b/bemas/templates/bemas/generic-objectclass-form.html
@@ -45,6 +45,9 @@
     {% if form.errors %}
       {% include "bemas/container-errors.html" %}
     {% endif %}
+    {% if messages %}
+      {% include "bemas/container-messages.html" %}
+    {% endif %}
     <h2><i class="fas fa-{{ objectclass_name|lower|get_icon }}"></i> <em>{{ objectclass_verbose_name }}</em></h2>
     {% if objectclass_logentry_url %}
       <a href="{{ objectclass_logentry_url }}"><i class="fas fa-{{ 'logentry'|get_icon }}"></i> Einträge im Bearbeitungsverlauf anzeigen</a>
@@ -110,6 +113,10 @@ <h2><i class="fas fa-{{ objectclass_name|lower|get_icon }}"></i> <em>{{ objectcl
       {% include "modal-error.html" %}
     </form>
     <script>
+      setTimeout(function () {
+        $('.alert-success').alert('close');
+      }, 3000);
+
       /**
        * @function
        * @name mapCallbackFunction
diff --git a/bemas/urls.py b/bemas/urls.py
index 84cb931d..35e0b19e 100644
--- a/bemas/urls.py
+++ b/bemas/urls.py
@@ -8,10 +8,9 @@
 from .views.views_codelist import CodelistCreateView, CodelistDeleteView, CodelistTableView, \
   CodelistUpdateView
 from .views.views_general import CodelistsIndexView, IndexView, MapView, OrphanedDataView
-from .views.views_objectclass import ComplaintDeleteView, ContactDeleteView, ContactCreateView, \
-  ContactUpdateView, GenericObjectclassCreateView, GenericObjectclassDeleteView, \
-  GenericObjectclassTableView, GenericObjectclassUpdateView, OrganizationDeleteView, \
-  PersonDeleteView
+from .views.views_objectclass import ComplaintDeleteView, GenericObjectclassCreateView, \
+  GenericObjectclassDeleteView, GenericObjectclassTableView, GenericObjectclassUpdateView, \
+  OrganizationDeleteView, PersonDeleteView
 
 router = routers.DefaultRouter()
 
@@ -255,7 +254,7 @@
     urlpatterns.append(
       path(
         'contact/create',
-        view=login_required(ContactCreateView.as_view(
+        view=login_required(GenericObjectclassCreateView.as_view(
           model=model
         )),
         name='contact_create'
@@ -266,7 +265,7 @@
     urlpatterns.append(
       path(
         'contact/update/<pk>',
-        view=login_required(ContactUpdateView.as_view(
+        view=login_required(GenericObjectclassUpdateView.as_view(
           model=model
         )),
         name='contact_update'
@@ -277,7 +276,7 @@
     urlpatterns.append(
       path(
         'contact/delete/<pk>',
-        view=login_required(ContactDeleteView.as_view(
+        view=login_required(GenericObjectclassDeleteView.as_view(
           model=model
         )),
         name='contact_delete'
@@ -650,7 +649,7 @@
     urlpatterns.append(
       path(
         'event/delete/<pk>',
-        view=login_required(ComplaintDeleteView.as_view(
+        view=login_required(GenericObjectclassDeleteView.as_view(
           model=model
         )),
         name='event_delete'
diff --git a/bemas/views/functions.py b/bemas/views/functions.py
index 3d26c7f0..c98c13ef 100644
--- a/bemas/views/functions.py
+++ b/bemas/views/functions.py
@@ -541,7 +541,13 @@ def get_referer_url(referer, fallback, lazy=False):
   :return: URL used for "cancel" buttons
   and/or used in case of successfully submitted forms
   """
-  if referer and '/delete' not in referer:
+  if (
+      referer
+      and '/contact' not in referer
+      and '/event' not in referer
+      and '/logentry' not in referer
+      and '/delete' not in referer
+  ):
     return referer
   return reverse_lazy(fallback) if lazy else reverse(fallback)
 
diff --git a/bemas/views/views_objectclass.py b/bemas/views/views_objectclass.py
index d6bc31a5..9717eb33 100644
--- a/bemas/views/views_objectclass.py
+++ b/bemas/views/views_objectclass.py
@@ -3,7 +3,7 @@
 from django.db.models import ProtectedError
 from django.forms.models import modelform_factory
 from django.http import HttpResponseRedirect
-from django.urls import reverse, reverse_lazy
+from django.urls import reverse
 from django.views.generic.base import TemplateView
 from django.views.generic.edit import CreateView, DeleteView, UpdateView
 from json import dumps
@@ -71,8 +71,11 @@ def get_context_data(self, **kwargs):
     :return: dictionary with all context elements for this view
     """
     # set generic object class context for create, update and/or delete views
-    cancel_url = get_referer_url(
-      get_referer(self.request), 'bemas:' + self.model.__name__.lower() + '_table')
+    if issubclass(self.model, Contact):
+      fallback_url = 'bemas:organization_table'
+    else:
+      fallback_url = 'bemas:' + self.model.__name__.lower() + '_table'
+    cancel_url = get_referer_url(get_referer(self.request), fallback_url)
     context = set_generic_objectclass_create_update_delete_context(
       super().get_context_data(**kwargs),
       self.request,
@@ -122,11 +125,11 @@ def form_valid(self, form):
     """
     # return to either the original referer or a default page
     referer = form.data.get('original_referer', None)
-    self.success_url = get_referer_url(
-      referer if referer else None,
-      'bemas:' + self.model.__name__.lower() + '_table',
-      True
-    )
+    if issubclass(self.model, Contact):
+      fallback_url = 'bemas:organization_table'
+    else:
+      fallback_url = 'bemas:' + self.model.__name__.lower() + '_table'
+    self.success_url = get_referer_url(referer if referer else None, fallback_url, True)
     # string representation of new complaint equals its primary key
     # (which is not yet available) and thus use its description here
     if issubclass(self.model, Complaint):
@@ -203,8 +206,11 @@ def get_context_data(self, **kwargs):
     :return: dictionary with all context elements for this view
     """
     # set generic object class context for create, update and/or delete views
-    cancel_url = get_referer_url(
-      get_referer(self.request), 'bemas:' + self.model.__name__.lower() + '_table')
+    if issubclass(self.model, Contact):
+      fallback_url = 'bemas:organization_table'
+    else:
+      fallback_url = 'bemas:' + self.model.__name__.lower() + '_table'
+    cancel_url = get_referer_url(get_referer(self.request), fallback_url)
     context = set_generic_objectclass_create_update_delete_context(
       super().get_context_data(**kwargs),
       self.request,
@@ -306,11 +312,11 @@ def form_valid(self, form):
     """
     # return to either the original referer or a default page
     referer = form.data.get('original_referer', None)
-    self.success_url = get_referer_url(
-      referer if referer else None,
-      'bemas:' + self.model.__name__.lower() + '_table',
-      True
-    )
+    if issubclass(self.model, Contact):
+      fallback_url = 'bemas:organization_table'
+    else:
+      fallback_url = 'bemas:' + self.model.__name__.lower() + '_table'
+    self.success_url = get_referer_url(referer if referer else None, fallback_url, True)
     success(
       self.request,
       '{} {} <strong><em>{}</em></strong> wurde erfolgreich geändert!'.format(
@@ -381,8 +387,11 @@ def get_context_data(self, **kwargs):
     :return: dictionary with all context elements for this view
     """
     # set generic object class context for create, update and/or delete views
-    cancel_url = get_referer_url(
-      get_referer(self.request), 'bemas:' + self.model.__name__.lower() + '_table')
+    if issubclass(self.model, Contact):
+      fallback_url = 'bemas:organization_table'
+    else:
+      fallback_url = 'bemas:' + self.model.__name__.lower() + '_table'
+    cancel_url = get_referer_url(get_referer(self.request), fallback_url)
     context = set_generic_objectclass_create_update_delete_context(
       super().get_context_data(**kwargs),
       self.request,
@@ -561,33 +570,3 @@ def get_context_data(self, **kwargs):
     # add custom deletion hints (shown as text to user) to context
     context['deletion_hints'] = self.deletion_hints
     return context
-
-
-class ContactCreateView(GenericObjectclassCreateView):
-  """
-  view for form page for creating an instance of object class contact
-
-  :param cancel_url: custom cancel URL
-  """
-
-  cancel_url = reverse_lazy('bemas:organization_table')
-
-
-class ContactUpdateView(GenericObjectclassUpdateView):
-  """
-  view for form page for updating an instance of object class contact
-
-  :param cancel_url: custom cancel URL
-  """
-
-  cancel_url = reverse_lazy('bemas:organization_table')
-
-
-class ContactDeleteView(GenericObjectclassDeleteView):
-  """
-  view for form page for deleting an instance of object class contact
-
-  :param cancel_url: custom cancel URL
-  """
-
-  cancel_url = reverse_lazy('bemas:organization_table')