Merge pull request #6 from arthur-schnitzler/main

WIP

apis_core/apis_entities/detail_views.py

@@ -1,12 +1,10 @@
 from django.conf import settings
-from django.contrib.auth.mixins import UserPassesTestMixin
 from django.db.models import Q
 from django.http import HttpResponse, Http404
 from django.shortcuts import get_object_or_404
 from django.template.loader import select_template
 from django.views import View
 from django_tables2 import RequestConfig
-from django.urls import reverse
 from django.shortcuts import redirect
 
 from apis_core.apis_labels.models import Label
@@ -15,10 +13,8 @@
 from apis_core.apis_relations.tables import (
     get_generic_relations_table,
     LabelTableBase,
-)  # , EntityDetailViewLabelTable
-from apis_core.helper_functions.utils import access_for_all
+)
 from .models import TempEntityClass, BASE_URI
-from .views import get_highlighted_texts
 
 
 def get_object_from_pk_or_uri(request, pk):
@@ -45,13 +41,9 @@ def get_object_from_pk_or_uri(request, pk):
         return instance
 
 
-class GenericEntitiesDetailView(UserPassesTestMixin, View):
+class GenericEntitiesDetailView(View):
     # login_url = '/accounts/login/'
 
-    def test_func(self):
-        access = access_for_all(self, viewtype="detail")
-        return access
-
     def get(self, request, *args, **kwargs):
         entity = kwargs["entity"].lower()
         pk = kwargs["pk"]
@@ -109,7 +101,6 @@ def get(self, request, *args, **kwargs):
                 )
             )
         object_lod = Uri.objects.filter(entity=instance)
-        object_texts, ann_proj_form = get_highlighted_texts(request, instance)
         object_labels = Label.objects.filter(temp_entity=instance)
         tb_label = LabelTableBase(data=object_labels, prefix=entity.title()[:2] + "L-")
         tb_label_open = request.GET.get("PL-page", None)
@@ -121,26 +112,6 @@ def get(self, request, *args, **kwargs):
                 "apis_entities/detail_views/entity_detail_generic.html",
             ]
         )
-        tei = getattr(settings, "APIS_TEI_TEXTS", [])
-        if tei:
-            tei = set(tei) & set([x.kind.name for x in instance.text.all()])
-        ceteicean_css = getattr(settings, "APIS_CETEICEAN_CSS", None)
-        ceteicean_js = getattr(settings, "APIS_CETEICEAN_JS", None)
-        openseadragon_js = getattr(settings, "APIS_OSD_JS", None)
-        openseadragon_img = getattr(settings, "APIS_OSD_IMG_PREFIX", None)
-        iiif_field = getattr(settings, "APIS_IIIF_WORK_KIND", None)
-        if iiif_field:
-            try:
-                if "{}".format(instance.kind) == "{}".format(iiif_field):
-                    iiif = True
-                else:
-                    iiif = False
-            except AttributeError:
-                iiif = False
-        else:
-            iiif = False
-        iiif_server = getattr(settings, "APIS_IIIF_SERVER", None)
-        iiif_info_json = instance.name
         try:
             no_merge_labels = [
                 x for x in object_labels if not x.label_type.name.startswith("Legacy")
@@ -153,16 +124,6 @@ def get(self, request, *args, **kwargs):
             "right_card": side_bar,
             "no_merge_labels": no_merge_labels,
             "object_lables": object_labels,
-            "object_texts": object_texts,
             "object_lod": object_lod,
-            "tei": tei,
-            "ceteicean_css": ceteicean_css,
-            "ceteicean_js": ceteicean_js,
-            "iiif": iiif,
-            "openseadragon_js": openseadragon_js,
-            "openseadragon_img": openseadragon_img,
-            "iiif_field": iiif_field,
-            "iiif_info_json": iiif_info_json,
-            "iiif_server": iiif_server,
         }
         return HttpResponse(template.render(request=request, context=context))

apis_core/apis_entities/templates/apis_entities/detail_views/person_detail_generic.html

@@ -1,9 +1,7 @@
 {% extends "apis_entities/detail_views/entity_detail_generic.html" %}
-{% block Titel %} {{ object.id }} {% endblock %}
-
 
     {% block info-table %}
-    <table class="table table-bordered table-hover">
+    <table class="table">
         <tr>
             <th>
                 Name
@@ -12,18 +10,21 @@
                 {{ object.name }}, {{ object.first_name }}
             </td>
         </tr>
+        {% if no_merge_labels %}
         <tr>
             <th>
-                Alternative Names
+                Alternative Namen
             </th>
             <td>
                 {% for x in no_merge_labels %}
-                    <li>
+                    <li class="list-unstyled">
                         <small>{{ x.label_type }}: </small>{{ x.label }}
                     </li>
                 {% endfor %}
+
             </td>
         </tr>
+        {% endif %}
         <tr>
             <th>
                 ID

apis_core/apis_entities/templates/apis_entities/entity_edit_generic.html

@@ -6,9 +6,6 @@
 <script src="https://unpkg.com/[email protected]"></script>
 {% load django_tables2 %}
 {% load crispy_forms_tags %}
-<style>
-
-</style>
 <style>
     a {
         color: var(--{{ entity_type }});

apis_core/apis_labels/urls.py

@@ -6,8 +6,5 @@
 app_name = "apis_labels"
 
 urlpatterns = [
-    path("list/", views.LabelListView.as_view(), name="label_list"),
-    path("create/", views.label_create, name="label_create"),
-    path("edit/<int:pk>", views.label_edit, name="label_edit"),
-    path("delete/<int:pk>", views.LabelDelete.as_view(), name="label_delete"),
+    path("delete-from-tabel/<int:label_id>/", views.delete_label, name="label_delete"),
 ]

apis_core/apis_labels/views.py

@@ -1,57 +1,13 @@
-from django.shortcuts import render, redirect, get_object_or_404
-from django.urls import reverse_lazy
-from django.views import generic
-from django.views.generic.edit import DeleteView
+from django.contrib.auth.decorators import login_required
+from django.http import HttpResponse
 
-from .forms import LabelForm
-from .models import Label
-
-
-class LabelListView(generic.ListView):
-    model = Label
-    template_name = "apis_labels/labels_list.html"
-    context_object_name = "object_list"
-
-    def get_queryset(self):
-        return Label.objects.order_by("label")
 
-
-def label_create(request):
-    if request.method == "POST":
-        form = LabelForm(request.POST)
-        if form.is_valid():
-            form.save()
-            return redirect("apis_labels:label_list")
-        else:
-            return render(request, "apis_labels/label_create.html", {"form": form})
-    else:
-        form = LabelForm()
-        return render(request, "apis_labels/label_create.html", {"form": form})
-
-
-def label_edit(request, pk):
-    instance = get_object_or_404(Label, pk=pk)
-    if request.method == "POST":
-        form = LabelForm(request.POST, instance=instance)
-        if form.is_valid():
-            form.save()
-            return redirect("apis_labels:label_list")
-        else:
-            return render(
-                request,
-                "apis_labels/label_create.html",
-                {"form": form, "instance": instance},
-            )
-    else:
-        form = LabelForm(instance=instance)
-        return render(
-            request,
-            "apis_labels/label_create.html",
-            {"form": form, "instance": instance},
-        )
+from .models import Label
 
 
-class LabelDelete(DeleteView):
-    model = Label
-    template_name = "apis_templates/confirm_delete.html"
-    success_url = reverse_lazy("apis_labels:label_list")
+@login_required
+def delete_label(request, label_id):
+    instance = Label.objects.get(id=label_id)
+    label = f"{instance}"
+    instance.delete()
+    return HttpResponse(f"<small>gelöschtes Label: {label}</small> ")

apis_core/apis_relations/tables.py

@@ -162,7 +162,7 @@ class Meta:
 
             # This attrs dictionary I took over from the tables implementation before. No idea if and where it would be needed.
             attrs = {
-                "class": "table table-hover table-striped table-condensed",
+                "class": "table table-hover table-condensed",
                 "id": related_entity_class_name_a.title()[:2]
                 + related_entity_class_name_b.title()[:2]
                 + "_conn",
@@ -338,7 +338,7 @@ class Meta:
         sequence = ("delete", "uri")
         # add class="paleblue" to <table> tag
         attrs = {
-            "class": "table table-hover table-striped table-condensed",
+            "class": "table table-hover table-condensed",
             "id": "PURI_conn",
         }
 
@@ -372,7 +372,7 @@ class Meta:
 
         # add class="paleblue" to <table> tag
         attrs = {
-            "class": "table table-hover table-striped table-condensed",
+            "class": "table table-hover table-condensed",
             "id": "PL_conn",
         }
 

apis_core/apis_relations/templates/apis_relations/delete_button_generic_ajax_form.html

@@ -4,7 +4,7 @@
     title="Verbindung löschen"
     hx-get="/apis/relations/delete/{{ record.pk }}/"
     hx-target="closest tr" hx-swap="outerHTML swap:1s"
-    hx-confirm="Sicher, weil was weg ist ist weg"
+    hx-confirm="Sicher? Weil was weg ist ist weg"
     >
     <i class="bi bi-trash"></i>
 </button>

apis_core/apis_relations/templates/apis_relations/delete_button_label_form.html

@@ -1,14 +1,9 @@
 <a
     class="btn"
     hx-trigger="click"
-    hx-post="/apis/relations/ajax/get/"
-    hx-target="#editFormDiv_PersonLabel"
-    hx-vals='{
-        "FormName": "PersonLabelForm",
-        "SiteID": "{{ record.temp_entity.id }}",
-        "ObjectID": "{{ record.pk }}",
-        "entity_type": "{{ entity_type }}",
-        "ButtonText": "speichern"
-    }'>
-    <i class="bi bi bi-trash" title="Label: '{{ record }}' bearbeiten"> </i>
+    hx-post="/apis/labels/delete-from-tabel/{{ record.pk }}/"
+    hx-confirm="Sicher? Weil was weg ist ist weg"
+    hx-target="closest tr" hx-swap="outerHTML swap:1s"
+    >
+    <i class="bi bi bi-trash" title="Label: '{{ record }}' löschen"> </i>
 </a>

apis_core/apis_relations/templates/apis_relations/edit_button_label_form.html

@@ -7,7 +7,7 @@
         "FormName": "PersonLabelForm",
         "SiteID": "{{ record.temp_entity.id }}",
         "ObjectID": "{{ record.pk }}",
-        "entity_type": "{{ entity_type }}",
+        "entity_type": "{{ record.temp_entity.get_child_class|lower }}",
         "ButtonText": "speichern"
     }'>
     <i class="bi bi-pencil-square" title="Label: '{{ record }}' bearbeiten"> </i>

templates/base.html

@@ -1,5 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" class="h-100" >
+<meta charset="utf-8">
+<title>{% block title %}PMB{% endblock %}</title>
 
 <head>
 {% include "partials/head.html" %}

templates/partials/head.html

@@ -1,6 +1,4 @@
 {% load static %}
-<meta charset="utf-8">
-<title>{% block title %}PMB{% endblock %}</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 {% block metaDescription %}
 {% endblock %}