From 9d6292aa6da2d10dd3d223ca72c9a5d937d9ae88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <git@imaniti.org> Date: Thu, 23 Mar 2023 10:32:11 +0100 Subject: [PATCH] fix broken select for signing parties --- contracts/admin.py | 2 +- ...ter_contractee_address_country_and_more.py | 23 +++++++++++++++++++ registry/settings/base.py | 2 +- registry/templates/admin/base_site.html | 3 ++- requirements/base.txt | 2 +- 5 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 contracts/migrations/0011_alter_contractee_address_country_and_more.py diff --git a/contracts/admin.py b/contracts/admin.py index 8170370..1cbf1f2 100644 --- a/contracts/admin.py +++ b/contracts/admin.py @@ -4,7 +4,7 @@ from django.contrib import admin from django.utils.html import format_html from fieldsets_with_inlines import FieldsetsInlineMixin from import_export import resources -from nested_inline.admin import ( +from nested_admin import ( NestedModelAdmin, NestedStackedInline, NestedTabularInline, diff --git a/contracts/migrations/0011_alter_contractee_address_country_and_more.py b/contracts/migrations/0011_alter_contractee_address_country_and_more.py new file mode 100644 index 0000000..4534288 --- /dev/null +++ b/contracts/migrations/0011_alter_contractee_address_country_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 4.1.4 on 2023-03-23 08:17 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('contracts', '0010_alter_contractee_address_country_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='contractee', + name='address_country', + field=models.CharField(default='CZ', max_length=256, verbose_name='ZemÄ›'), + ), + migrations.AlterField( + model_name='signee', + name='address_country', + field=models.CharField(default='CZ', max_length=256, verbose_name='ZemÄ›'), + ), + ] diff --git a/registry/settings/base.py b/registry/settings/base.py index 6e6d73f..6ff6fa8 100644 --- a/registry/settings/base.py +++ b/registry/settings/base.py @@ -54,8 +54,8 @@ INSTALLED_APPS = [ "django.contrib.messages", "django.contrib.staticfiles", "fieldsets_with_inlines", + "nested_admin", "import_export", - "nested_inline", "rangefilter", "guardian", "markdownx", diff --git a/registry/templates/admin/base_site.html b/registry/templates/admin/base_site.html index 6048f3e..f76cc4b 100644 --- a/registry/templates/admin/base_site.html +++ b/registry/templates/admin/base_site.html @@ -1,7 +1,8 @@ {% extends 'admin/base_site.html' %} {% load static %} -{% block extrastyle %}{{ block.super }} +{% block extrastyle %} +{{ block.super }} <style> :root, :root .admin-interface { --djai-tab-bg: var(--admin-interface-header-background-color); diff --git a/requirements/base.txt b/requirements/base.txt index eb6b81c..e45386a 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -7,7 +7,7 @@ django-database-url==1.0.3 django-downloadview==2.3.0 django-fieldsets-with-inlines==0.6 django-import-export==3.1.0 -django-nested-inline==0.4.6 +django-nested-admin==4.0.2 django-ordered-model==3.7.1 psycopg2-binary==2.9.5 django-webpack-loader==1.8.0 -- GitLab