update to django v4.x

.gitignore

@@ -22,3 +22,4 @@ __try.html
 orea/whoosh/*
 /images_metadata/templates/images_metadata/*.bak
 orea/settings/local.py
+/env

bib/urls.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-from django.conf.urls import url
+from django.urls import path
 from . import views
 
+app_name = "bib"
 urlpatterns = [
-    url(r"^synczotero/$", views.sync_zotero, name="synczotero"),
-    url(r"^synczotero/result$", views.sync_zotero_action, name="synczotero_action"),
+    path("synczotero/", views.sync_zotero, name="synczotero"),
+    path("synczotero/result", views.sync_zotero_action, name="synczotero_action"),
 ]

browsing/filters.py

@@ -56,30 +56,30 @@ class MapListFilter(django_filters.FilterSet):
     )
     period = django_filters.CharFilter(
         label="Period",
-        name="area__period__period_name",
+        field_name="area__period__period_name",
         distinct=True,
         lookup_expr="icontains",
         help_text=False,
     )
     period__cs_name = django_filters.CharFilter(
         label="Period Chronological system",
         help_text=False,
-        name="area__period__cs_name",
+        field_name="area__period__cs_name",
         distinct=True,
         lookup_expr="icontains",
     )
     area__period__start_date1_BC = django_filters.NumberFilter(
         lookup_expr="lte",
         label="Period start date 1 BC",
         help_text="Lesser than or equal to",
-        name="area__period__start_date1_BC",
+        field_name="area__period__start_date1_BC",
         distinct=True,
     )
     area__period__end_date1_BC = django_filters.NumberFilter(
         lookup_expr="gte",
         label="Period end date 1 BC",
         help_text="Greater than or equal to",
-        name="area__period__end_date1_BC",
+        field_name="area__period__end_date1_BC",
         distinct=True,
     )
     # area filters
@@ -353,6 +353,7 @@ class MapListFilter(django_filters.FilterSet):
     class Meta:
         model = Site
         form = SiteFilterForm
+        fields = "__all__"
 
 
 class SiteListFilter(django_filters.FilterSet):
@@ -370,30 +371,30 @@ class SiteListFilter(django_filters.FilterSet):
     )
     period = django_filters.CharFilter(
         label="Period",
-        name="area__period__period_name",
+        field_name="area__period__period_name",
         distinct=True,
         lookup_expr="icontains",
         help_text=False,
     )
     period__cs_name = django_filters.CharFilter(
         label="Period Chronological system",
         help_text=False,
-        name="area__period__cs_name",
+        field_name="area__period__cs_name",
         distinct=True,
         lookup_expr="icontains",
     )
     area__period__start_date1_BC = django_filters.NumberFilter(
         lookup_expr="lte",
         label="Period start date 1 BC",
         help_text="Lesser than or equal to",
-        name="area__period__start_date1_BC",
+        field_name="area__period__start_date1_BC",
         distinct=True,
     )
     area__period__end_date1_BC = django_filters.NumberFilter(
         lookup_expr="gte",
         label="Period end date 1 BC",
         help_text="Greater than or equal to",
-        name="area__period__end_date1_BC",
+        field_name="area__period__end_date1_BC",
         distinct=True,
     )
 
@@ -417,14 +418,14 @@ class AreaListFilter(django_filters.FilterSet):
     site__name = django_filters.CharFilter(lookup_expr="icontains", help_text=False)
     period = django_filters.CharFilter(
         label="Period",
-        name="period__period_name",
+        field_name="period__period_name",
         distinct=True,
         lookup_expr="icontains",
         help_text=False,
     )
     period__cs_name = django_filters.CharFilter(
         label="Period Chronological system",
-        name="period__cs_name",
+        field_name="period__cs_name",
         distinct=True,
         lookup_expr="icontains",
         help_text=False,
@@ -583,15 +584,15 @@ class FindsListFilter(django_filters.FilterSet):
     )
     period = django_filters.CharFilter(
         label="Period",
-        name="area__period__period_name",
+        field_name="area__period__period_name",
         distinct=True,
         lookup_expr="icontains",
         help_text=False,
     )
     period__cs_name = django_filters.CharFilter(
         label="Period Chronological system",
         help_text=False,
-        name="area__period__cs_name",
+        field_name="area__period__cs_name",
         distinct=True,
         lookup_expr="icontains",
     )
@@ -689,7 +690,7 @@ class ResearchEventListFilter(django_filters.FilterSet):
         queryset=DC_researchevent_researchtype.objects.all(), help_text=False
     )
     institution = django_filters.CharFilter(
-        name="institution__name",
+        field_name="institution__name",
         distinct=True,
         lookup_expr="icontains",
         help_text=False,

browsing/forms.py

@@ -1,18 +1,10 @@
-import autocomplete_light
 from django import forms
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Submit, Layout, Fieldset, Field
+from crispy_forms.layout import Submit, Layout, Fieldset
 from defcdb.models import *
-from .autocomplete_light_registry import SiteAutocomplete
 
 
 class SiteFilterForm(forms.ModelForm):
-    name = autocomplete_light.ModelMultipleChoiceField(
-        Site.objects.all(),
-        required=False,
-        widget=autocomplete_light.MultipleChoiceWidget("SiteAutocomplete"),
-    )
-
     class Meta:
         model = Site
         fields = ["name"]

browsing/templates/browsing/generic_list.html

@@ -1,6 +1,6 @@
 {% extends "defcdb/base.html" %}
 
-{% load staticfiles %}
+{% load static %}
 {% load django_tables2 %}
 {% load i18n %}
 {% block Titel %} See all {{ object.classname }} {% endblock %}

browsing/urls.py

@@ -1,30 +1,33 @@
-from django.conf.urls import url
+from django.urls import path
 from . import views
 
+
+app_name = "browsing"
+
 urlpatterns = [
-    url(r"download-sites/$", views.SiteDownloadView.as_view(), name="download-sites"),
-    url(r"download-areas/$", views.AreaDownloadView.as_view(), name="download-areas"),
-    url(r"download-finds/$", views.FindsDownloadView.as_view(), name="download-finds"),
-    url(
-        r"download-research-events/$",
+    path("download-sites/", views.SiteDownloadView.as_view(), name="download-sites"),
+    path("download-areas/", views.AreaDownloadView.as_view(), name="download-areas"),
+    path("download-finds/", views.FindsDownloadView.as_view(), name="download-finds"),
+    path(
+        "download-research-events/",
         views.ResearchEventDownloadView.as_view(),
         name="download-research-events",
     ),
-    url(
-        r"download-interpretations/$",
+    path(
+        "download-interpretations/",
         views.InterpretationDownloadView.as_view(),
         name="download-interpretations",
     ),
-    url(r"sites/$", views.SiteListView.as_view(), name="browse_sites"),
-    url(r"areas/$", views.AreaListView.as_view(), name="browse_areas"),
-    url(r"finds/$", views.FindsListView.as_view(), name="browse_finds"),
-    url(
-        r"research_events/$",
+    path("sites/", views.SiteListView.as_view(), name="browse_sites"),
+    path("areas/", views.AreaListView.as_view(), name="browse_areas"),
+    path("finds/", views.FindsListView.as_view(), name="browse_finds"),
+    path(
+        "research_events/",
         views.ResearchEventListView.as_view(),
         name="browse_researchevents",
     ),
-    url(
-        r"interpretations/$",
+    path(
+        "interpretations/",
         views.InterpretationListView.as_view(),
         name="browse_interpretations",
     ),

browsing/views.py

@@ -24,14 +24,9 @@
     InterpretationTable,
 )
 import csv
-import re
 import time
 import datetime
-import requests
 from django.http import HttpResponse
-from django.shortcuts import render
-from django.shortcuts import render_to_response
-from django.template import RequestContext
 
 
 def serialize(modelclass):