diff --git a/requirements/base.in b/requirements/base.in index a7ade32d00..e2888b2348 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -33,7 +33,7 @@ django-colorfield django-registration django-view-breadcrumbs markdown -django_better_admin_arrayfield +django-jsonform humanfriendly git+https://github.com/maykinmedia/mail-editor.git@0.3.6#egg=mail-editor fontawesomefree diff --git a/requirements/base.txt b/requirements/base.txt index f31baa71f2..01169d06b3 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -145,8 +145,6 @@ django-autoslug==1.9.8 # via -r requirements/base.in django-axes==5.25.0 # via -r requirements/base.in -django-better-admin-arrayfield==1.4.2 - # via -r requirements/base.in django-choices==2.0.0 # via mail-editor django-ckeditor==6.7.0 @@ -201,7 +199,9 @@ django-ipware==4.0.0 django-js-asset==2.2.0 # via django-ckeditor django-jsonform==2.22.0 - # via mozilla-django-oidc-db + # via + # -r requirements/base.in + # mozilla-django-oidc-db django-localflavor==3.1 # via -r requirements/base.in django-log-outgoing-requests==0.6.1 diff --git a/requirements/ci.txt b/requirements/ci.txt index 01102ead39..3e00b1ceb9 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -232,10 +232,6 @@ django-axes==5.25.0 # via # -c requirements/base.txt # -r requirements/base.txt -django-better-admin-arrayfield==1.4.2 - # via - # -c requirements/base.txt - # -r requirements/base.txt django-choices==2.0.0 # via # -c requirements/base.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index cac179e3bd..026d469620 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -271,10 +271,6 @@ django-axes==5.25.0 # via # -c requirements/ci.txt # -r requirements/ci.txt -django-better-admin-arrayfield==1.4.2 - # via - # -c requirements/ci.txt - # -r requirements/ci.txt django-choices==2.0.0 # via # -c requirements/ci.txt diff --git a/src/digid_eherkenning_oidc_generics/admin.py b/src/digid_eherkenning_oidc_generics/admin.py index 341c5db087..cfb5601682 100644 --- a/src/digid_eherkenning_oidc_generics/admin.py +++ b/src/digid_eherkenning_oidc_generics/admin.py @@ -1,14 +1,13 @@ from django.contrib import admin from django.utils.translation import gettext_lazy as _ -from django_better_admin_arrayfield.admin.mixins import DynamicArrayMixin from solo.admin import SingletonModelAdmin from .forms import OpenIDConnectDigiDConfigForm, OpenIDConnectEHerkenningConfigForm from .models import OpenIDConnectDigiDConfig, OpenIDConnectEHerkenningConfig -class OpenIDConnectConfigBaseAdmin(DynamicArrayMixin, SingletonModelAdmin): +class OpenIDConnectConfigBaseAdmin(SingletonModelAdmin): fieldsets = ( ( _("Activation"), diff --git a/src/digid_eherkenning_oidc_generics/migrations/0001_initial.py b/src/digid_eherkenning_oidc_generics/migrations/0001_initial.py index 7d5b875d1c..1933a5ad77 100644 --- a/src/digid_eherkenning_oidc_generics/migrations/0001_initial.py +++ b/src/digid_eherkenning_oidc_generics/migrations/0001_initial.py @@ -2,7 +2,7 @@ import digid_eherkenning_oidc_generics.models from django.db import migrations, models -import django_better_admin_arrayfield.models.fields +import django_jsonform.models.fields import mozilla_django_oidc_db.models @@ -127,7 +127,7 @@ class Migration(migrations.Migration): ), ( "oidc_exempt_urls", - django_better_admin_arrayfield.models.fields.ArrayField( + django_jsonform.models.fields.ArrayField( base_field=models.CharField( max_length=1000, verbose_name="Exempt URL" ), @@ -188,7 +188,7 @@ class Migration(migrations.Migration): ), ( "oidc_rp_scopes_list", - django_better_admin_arrayfield.models.fields.ArrayField( + django_jsonform.models.fields.ArrayField( base_field=models.CharField( max_length=50, verbose_name="OpenID Connect scope" ), @@ -319,7 +319,7 @@ class Migration(migrations.Migration): ), ( "oidc_exempt_urls", - django_better_admin_arrayfield.models.fields.ArrayField( + django_jsonform.models.fields.ArrayField( base_field=models.CharField( max_length=1000, verbose_name="Exempt URL" ), @@ -380,7 +380,7 @@ class Migration(migrations.Migration): ), ( "oidc_rp_scopes_list", - django_better_admin_arrayfield.models.fields.ArrayField( + django_jsonform.models.fields.ArrayField( base_field=models.CharField( max_length=50, verbose_name="OpenID Connect scope" ), diff --git a/src/digid_eherkenning_oidc_generics/models.py b/src/digid_eherkenning_oidc_generics/models.py index b5827e0cac..15218033ee 100644 --- a/src/digid_eherkenning_oidc_generics/models.py +++ b/src/digid_eherkenning_oidc_generics/models.py @@ -2,7 +2,7 @@ from django.utils.functional import classproperty from django.utils.translation import gettext_lazy as _ -from django_better_admin_arrayfield.models.fields import ArrayField +from django_jsonform.models.fields import ArrayField from mozilla_django_oidc_db.models import CachingMixin, OpenIDConnectConfigBase from .digid_settings import DIGID_CUSTOM_OIDC_DB_PREFIX diff --git a/src/open_inwoner/conf/base.py b/src/open_inwoner/conf/base.py index 29235f6781..d7b7da2635 100644 --- a/src/open_inwoner/conf/base.py +++ b/src/open_inwoner/conf/base.py @@ -178,7 +178,6 @@ "solo", "colorfield", "view_breadcrumbs", - "django_better_admin_arrayfield", "django_jsonform", "simple_certmanager", "zgw_consumers", diff --git a/src/open_inwoner/configurations/migrations/0058_siteconfiguration_recipients_email_digest.py b/src/open_inwoner/configurations/migrations/0058_siteconfiguration_recipients_email_digest.py index 2db6b707a0..a7a78cc94d 100644 --- a/src/open_inwoner/configurations/migrations/0058_siteconfiguration_recipients_email_digest.py +++ b/src/open_inwoner/configurations/migrations/0058_siteconfiguration_recipients_email_digest.py @@ -1,7 +1,7 @@ # Generated by Django 3.2.23 on 2024-01-22 10:18 from django.db import migrations, models -import django_better_admin_arrayfield.models.fields +import django_jsonform.models.fields class Migration(migrations.Migration): @@ -14,7 +14,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name="siteconfiguration", name="recipients_email_digest", - field=django_better_admin_arrayfield.models.fields.ArrayField( + field=django_jsonform.models.fields.ArrayField( base_field=models.EmailField(max_length=254), blank=True, default=list, diff --git a/src/open_inwoner/configurations/models.py b/src/open_inwoner/configurations/models.py index 89a80ce7e5..ed097a167e 100644 --- a/src/open_inwoner/configurations/models.py +++ b/src/open_inwoner/configurations/models.py @@ -10,7 +10,7 @@ from django.utils.translation import gettext_lazy as _ from colorfield.fields import ColorField -from django_better_admin_arrayfield.models.fields import ArrayField +from django_jsonform.models.fields import ArrayField from filer.fields.image import FilerImageField from ordered_model.models import OrderedModel, OrderedModelManager from solo.models import SingletonModel diff --git a/src/open_inwoner/openzaak/migrations/0006_auto_20230123_1619.py b/src/open_inwoner/openzaak/migrations/0006_auto_20230123_1619.py index 3006b7fbe8..bbd4d193d0 100644 --- a/src/open_inwoner/openzaak/migrations/0006_auto_20230123_1619.py +++ b/src/open_inwoner/openzaak/migrations/0006_auto_20230123_1619.py @@ -1,7 +1,7 @@ # Generated by Django 3.2.15 on 2023-01-23 15:19 from django.db import migrations, models -import django_better_admin_arrayfield.models.fields +import django_jsonform.models.fields class Migration(migrations.Migration): @@ -14,7 +14,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name="openzaakconfig", name="allowed_file_extensions", - field=django_better_admin_arrayfield.models.fields.ArrayField( + field=django_jsonform.models.fields.ArrayField( base_field=models.CharField( max_length=8, verbose_name="Allowed file extensions" ), diff --git a/src/open_inwoner/openzaak/migrations/0007_alter_openzaakconfig_allowed_file_extensions.py b/src/open_inwoner/openzaak/migrations/0007_alter_openzaakconfig_allowed_file_extensions.py index 98ace8ee4e..38178cb101 100644 --- a/src/open_inwoner/openzaak/migrations/0007_alter_openzaakconfig_allowed_file_extensions.py +++ b/src/open_inwoner/openzaak/migrations/0007_alter_openzaakconfig_allowed_file_extensions.py @@ -1,7 +1,7 @@ # Generated by Django 3.2.15 on 2023-01-25 10:12 from django.db import migrations, models -import django_better_admin_arrayfield.models.fields +import django_jsonform.models.fields import open_inwoner.openzaak.models @@ -15,7 +15,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="openzaakconfig", name="allowed_file_extensions", - field=django_better_admin_arrayfield.models.fields.ArrayField( + field=django_jsonform.models.fields.ArrayField( base_field=models.CharField( max_length=8, verbose_name="Allowed file extensions" ), diff --git a/src/open_inwoner/openzaak/migrations/0009_auto_20230131_1253.py b/src/open_inwoner/openzaak/migrations/0009_auto_20230131_1253.py index 98d93119b7..aaf7967c8f 100644 --- a/src/open_inwoner/openzaak/migrations/0009_auto_20230131_1253.py +++ b/src/open_inwoner/openzaak/migrations/0009_auto_20230131_1253.py @@ -3,7 +3,7 @@ import django.db.models.deletion from django.db import migrations, models -import django_better_admin_arrayfield.models.fields +import django_jsonform.models.fields class Migration(migrations.Migration): @@ -49,7 +49,7 @@ class Migration(migrations.Migration): ), ( "zaaktype_uuids", - django_better_admin_arrayfield.models.fields.ArrayField( + django_jsonform.models.fields.ArrayField( base_field=models.UUIDField(verbose_name="Zaaktype UUID"), default=list, size=None, diff --git a/src/open_inwoner/openzaak/migrations/0025_auto_20231016_0957.py b/src/open_inwoner/openzaak/migrations/0025_auto_20231016_0957.py index 0d2809bbbb..0510008d52 100644 --- a/src/open_inwoner/openzaak/migrations/0025_auto_20231016_0957.py +++ b/src/open_inwoner/openzaak/migrations/0025_auto_20231016_0957.py @@ -2,7 +2,7 @@ from django.db import migrations, models import django.db.models.deletion -import django_better_admin_arrayfield.models.fields +import django_jsonform.models.fields class Migration(migrations.Migration): @@ -38,7 +38,7 @@ class Migration(migrations.Migration): ), ( "zaaktype_uuids", - django_better_admin_arrayfield.models.fields.ArrayField( + django_jsonform.models.fields.ArrayField( base_field=models.UUIDField(verbose_name="Zaaktype UUID"), default=list, size=None, diff --git a/src/open_inwoner/openzaak/migrations/0027_zaaktype_resultaattype_config.py b/src/open_inwoner/openzaak/migrations/0027_zaaktype_resultaattype_config.py index 9b32306884..c935811dc4 100644 --- a/src/open_inwoner/openzaak/migrations/0027_zaaktype_resultaattype_config.py +++ b/src/open_inwoner/openzaak/migrations/0027_zaaktype_resultaattype_config.py @@ -2,7 +2,7 @@ from django.db import migrations, models import django.db.models.deletion -import django_better_admin_arrayfield.models.fields +import django_jsonform.models.fields class Migration(migrations.Migration): @@ -34,7 +34,7 @@ class Migration(migrations.Migration): ), ( "zaaktype_uuids", - django_better_admin_arrayfield.models.fields.ArrayField( + django_jsonform.models.fields.ArrayField( base_field=models.UUIDField(verbose_name="Zaaktype UUID"), default=list, size=None, diff --git a/src/open_inwoner/openzaak/migrations/0034_zaaktypeconfig_urls.py b/src/open_inwoner/openzaak/migrations/0034_zaaktypeconfig_urls.py index 05298dc1d0..ae56b90b2b 100644 --- a/src/open_inwoner/openzaak/migrations/0034_zaaktypeconfig_urls.py +++ b/src/open_inwoner/openzaak/migrations/0034_zaaktypeconfig_urls.py @@ -1,7 +1,7 @@ # Generated by Django 3.2.20 on 2023-11-20 10:06 from django.db import migrations, models -import django_better_admin_arrayfield.models.fields +import django_jsonform.models.fields class Migration(migrations.Migration): @@ -14,7 +14,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name="zaaktypeconfig", name="urls", - field=django_better_admin_arrayfield.models.fields.ArrayField( + field=django_jsonform.models.fields.ArrayField( base_field=models.URLField(verbose_name="Zaaktype URL"), default=list, size=None, diff --git a/src/open_inwoner/openzaak/models.py b/src/open_inwoner/openzaak/models.py index 0460388632..677675c611 100644 --- a/src/open_inwoner/openzaak/models.py +++ b/src/open_inwoner/openzaak/models.py @@ -5,7 +5,7 @@ from django.utils import timezone from django.utils.translation import gettext_lazy as _ -from django_better_admin_arrayfield.models.fields import ArrayField +from django_jsonform.models.fields import ArrayField from furl import furl from solo.models import SingletonModel from zgw_consumers.api_models.constants import VertrouwelijkheidsAanduidingen diff --git a/src/open_inwoner/pdc/admin/category.py b/src/open_inwoner/pdc/admin/category.py index bfd7dd5728..32d6d46017 100644 --- a/src/open_inwoner/pdc/admin/category.py +++ b/src/open_inwoner/pdc/admin/category.py @@ -5,8 +5,7 @@ from django.forms import BaseModelFormSet from django.utils.translation import gettext as _ -from django_better_admin_arrayfield.admin.mixins import DynamicArrayMixin -from django_better_admin_arrayfield.forms.widgets import DynamicArrayWidget +from django_jsonform.widgets import JSONFormWidget from import_export.admin import ImportExportMixin from import_export.formats import base_formats from ordered_model.admin import OrderedInlineModelAdminMixin, OrderedTabularInline @@ -49,7 +48,7 @@ def __init__(self, *args, **kwargs): self.choices = choices_dict.items() -class DynamicArraySelectWidget(DynamicArrayWidget): +class DynamicArraySelectWidget(JSONFormWidget): def __init__(self, *args, **kwargs): kwargs["subwidget_form"] = ZaakTypenSelectWidget diff --git a/src/open_inwoner/pdc/migrations/0062_alter_category_zaaktypen.py b/src/open_inwoner/pdc/migrations/0062_alter_category_zaaktypen.py index 9544f8668a..0acd6dae15 100644 --- a/src/open_inwoner/pdc/migrations/0062_alter_category_zaaktypen.py +++ b/src/open_inwoner/pdc/migrations/0062_alter_category_zaaktypen.py @@ -1,7 +1,7 @@ # Generated by Django 3.2.20 on 2023-11-13 10:55 from django.db import migrations, models -import django_better_admin_arrayfield.models.fields +import django_jsonform.models.fields class Migration(migrations.Migration): @@ -14,7 +14,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="category", name="zaaktypen", - field=django_better_admin_arrayfield.models.fields.ArrayField( + field=django_jsonform.models.fields.ArrayField( base_field=models.CharField(blank=True, max_length=1000), blank=True, default=list, diff --git a/src/open_inwoner/pdc/models/category.py b/src/open_inwoner/pdc/models/category.py index 67b9145b9b..9d0abdb3af 100644 --- a/src/open_inwoner/pdc/models/category.py +++ b/src/open_inwoner/pdc/models/category.py @@ -2,7 +2,7 @@ from django.urls import reverse from django.utils.translation import gettext_lazy as _ -from django_better_admin_arrayfield.models.fields import ArrayField +from django_jsonform.models.fields import ArrayField from filer.fields.image import FilerImageField from treebeard.exceptions import InvalidMoveToDescendant from treebeard.mp_tree import MP_MoveHandler, MP_Node diff --git a/src/open_inwoner/search/admin.py b/src/open_inwoner/search/admin.py index 70be35d0cc..f826ccf896 100644 --- a/src/open_inwoner/search/admin.py +++ b/src/open_inwoner/search/admin.py @@ -3,7 +3,6 @@ from django.utils.html import format_html from django.utils.translation import gettext_lazy as _ -from django_better_admin_arrayfield.admin.mixins import DynamicArrayMixin from import_export.admin import ImportExportMixin from import_export.formats import base_formats @@ -12,7 +11,7 @@ @admin.register(Synonym) -class SynonymAdmin(ImportExportMixin, admin.ModelAdmin, DynamicArrayMixin): +class SynonymAdmin(ImportExportMixin, admin.ModelAdmin): list_display = ("term", "synonyms") resource_class = SynonymResource formats = [base_formats.CSV] diff --git a/src/open_inwoner/search/migrations/0001_initial.py b/src/open_inwoner/search/migrations/0001_initial.py index ae9f9ae0c3..01840552d2 100644 --- a/src/open_inwoner/search/migrations/0001_initial.py +++ b/src/open_inwoner/search/migrations/0001_initial.py @@ -2,7 +2,7 @@ from django.db import migrations, models -import django_better_admin_arrayfield.models.fields +import django_jsonform.models.fields class Migration(migrations.Migration): @@ -35,7 +35,7 @@ class Migration(migrations.Migration): ), ( "synonyms", - django_better_admin_arrayfield.models.fields.ArrayField( + django_jsonform.models.fields.ArrayField( base_field=models.TextField(verbose_name="synonyms"), help_text="Words-synonyms concerning the term", size=None, diff --git a/src/open_inwoner/search/migrations/0003_auto_20220218_1359.py b/src/open_inwoner/search/migrations/0003_auto_20220218_1359.py index 226ee0212f..9d2d008035 100644 --- a/src/open_inwoner/search/migrations/0003_auto_20220218_1359.py +++ b/src/open_inwoner/search/migrations/0003_auto_20220218_1359.py @@ -4,7 +4,7 @@ from django.conf import settings from django.db import migrations, models -import django_better_admin_arrayfield.models.fields +import django_jsonform.models.fields class Migration(migrations.Migration): @@ -77,7 +77,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="synonym", name="synonyms", - field=django_better_admin_arrayfield.models.fields.ArrayField( + field=django_jsonform.models.fields.ArrayField( base_field=models.TextField(verbose_name="Synonyms"), help_text="Words-synonyms concerning the term", size=None, diff --git a/src/open_inwoner/search/models.py b/src/open_inwoner/search/models.py index d0d3e99f67..918a2cd07b 100644 --- a/src/open_inwoner/search/models.py +++ b/src/open_inwoner/search/models.py @@ -3,7 +3,7 @@ from django.db.models.deletion import CASCADE from django.utils.translation import gettext_lazy as _ -from django_better_admin_arrayfield.models.fields import ArrayField +from django_jsonform.models.fields import ArrayField from .query import FieldBoostQueryset