diff --git a/contracts/admin.py b/contracts/admin.py index f528005365d039ae6b9d4771fb711a6d790f613e..a5474b072572315009a6e7951f313b3fedb9333b 100644 --- a/contracts/admin.py +++ b/contracts/admin.py @@ -1,5 +1,3 @@ -from admin_extra_buttons.api import ExtraButtonsMixin, button -from admin_extra_buttons.utils import HttpResponseRedirectToReferrer from dal_admin_filters import AutocompleteFilter from django.contrib import admin from django.utils.html import format_html @@ -75,7 +73,7 @@ class ContractIntentInline(admin.TabularInline): extra = 0 -class ContractAdmin(ExtraButtonsMixin, MarkdownxGuardedModelAdmin): +class ContractAdmin(MarkdownxGuardedModelAdmin): form = ContractAdminForm readonly_fields = ("created_by",) @@ -87,22 +85,6 @@ class ContractAdmin(ExtraButtonsMixin, MarkdownxGuardedModelAdmin): ContractIntentInline, ) - @button( - permission="contracts.approve", - label="Schválit", - change_form=True, - html_attrs={ - "style": "background-color:var(--admin-interface-save-button-background-color);" - "color:var(--admin-interface-save-button-text-color)" - } - ) - def approve(self, request): - - - self.message_user(request, "Smlouva schválena.") - - return HttpResponseRedirectToReferrer(request) - def get_fieldsets(self, request, obj=None): fieldsets = [ ( 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 0000000000000000000000000000000000000000..f6f1793cf8e5cd97063ad17d997c1faa809a5158 --- /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-15 12:14 + +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 7849f65dec14b7860058d04fc1493f201d5819cb..58442285ca634ee4892511f44e828059b6a1b861 100644 --- a/registry/settings/base.py +++ b/registry/settings/base.py @@ -56,7 +56,6 @@ INSTALLED_APPS = [ "django.contrib.sessions", "django.contrib.messages", "django.contrib.staticfiles", - "admin_extra_buttons", "import_export", "rangefilter", "guardian", diff --git a/requirements/base.txt b/requirements/base.txt index ade0d47a3c92ea62029ee484bb974c6a3e36a264..9fd8bfa52a579ef340992f7d117b5ac379d74d29 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,6 +1,5 @@ dal-admin-filters==1.1.0 django==4.1.4 -django-admin-extra-buttons==1.5.6 django-admin-index==2.0.2 django-admin-interface==0.24.2 django-admin-rangefilter==0.9.0 diff --git a/users/migrations/0003_alter_user_options.py b/users/migrations/0003_alter_user_options.py new file mode 100644 index 0000000000000000000000000000000000000000..43085218f30c4f6f76b6e22f06ab1d0540d87626 --- /dev/null +++ b/users/migrations/0003_alter_user_options.py @@ -0,0 +1,17 @@ +# Generated by Django 4.1.4 on 2023-03-15 12:14 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0002_alter_user_options'), + ] + + operations = [ + migrations.AlterModelOptions( + name='user', + options={'verbose_name': 'Uživatel', 'verbose_name_plural': 'Uživatelé'}, + ), + ]