From 0986575e644d9ef6556132ee6b56f2251eb78780 Mon Sep 17 00:00:00 2001 From: Anas Ahmed Date: Mon, 24 Jun 2024 15:55:02 +0500 Subject: [PATCH 1/2] changed imports ugetext_lazy to gettext_lazy to make it compatible with newer djangi version. --- eav/fields.py | 2 +- eav/forms.py | 2 +- eav/models.py | 2 +- eav/validators.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eav/fields.py b/eav/fields.py index f573332..3377730 100644 --- a/eav/fields.py +++ b/eav/fields.py @@ -2,7 +2,7 @@ import re from django.core.exceptions import ValidationError from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class EavSlugField(models.SlugField): diff --git a/eav/forms.py b/eav/forms.py index b1f97b1..e750b2b 100644 --- a/eav/forms.py +++ b/eav/forms.py @@ -5,7 +5,7 @@ from copy import deepcopy from django.contrib.admin.widgets import AdminSplitDateTime from django.forms import (BooleanField, CharField, ChoiceField, DateTimeField, FloatField, IntegerField, ModelForm) -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class BaseDynamicEntityForm(ModelForm): diff --git a/eav/models.py b/eav/models.py index ec5e680..bc2df78 100644 --- a/eav/models.py +++ b/eav/models.py @@ -19,7 +19,7 @@ from django.core.exceptions import ValidationError from django.db import models from django.db.models.base import ModelBase from django.utils import timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from .validators import validate_decimal from .validators import validate_enum_multi diff --git a/eav/validators.py b/eav/validators.py index dd0586e..f01a8c7 100644 --- a/eav/validators.py +++ b/eav/validators.py @@ -15,7 +15,7 @@ import datetime from django.core.exceptions import ValidationError from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ def validate_text(value): From 257cd62a3bdff96016b69a66347401aed473950d Mon Sep 17 00:00:00 2001 From: Anas Ahmed Date: Thu, 27 Jun 2024 16:45:25 +0500 Subject: [PATCH 2/2] changed NullBoolean field to Boolean(null=True). --- eav/migrations/0001_initial.py | 2 +- eav/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eav/migrations/0001_initial.py b/eav/migrations/0001_initial.py index 7417deb..686440d 100644 --- a/eav/migrations/0001_initial.py +++ b/eav/migrations/0001_initial.py @@ -55,7 +55,7 @@ class Migration(migrations.Migration): ('value_float', models.FloatField(blank=True, null=True)), ('value_int', models.IntegerField(blank=True, null=True)), ('value_date', models.DateTimeField(blank=True, null=True)), - ('value_bool', models.NullBooleanField()), + ('value_bool', models.BooleanField(null=True)), ('generic_value_id', models.IntegerField(blank=True, null=True)), ('created', models.DateTimeField(default=django.utils.timezone.now, verbose_name='Created')), ('modified', models.DateTimeField(auto_now=True, verbose_name='Modified')), diff --git a/eav/models.py b/eav/models.py index bc2df78..234c39d 100644 --- a/eav/models.py +++ b/eav/models.py @@ -418,7 +418,7 @@ class Value(models.Model): value_decimal = models.DecimalField(blank = True, null = True, max_digits = 14, decimal_places = 2) value_int = models.IntegerField(blank = True, null = True) value_date = models.DateTimeField(blank = True, null = True) - value_bool = models.NullBooleanField(blank = True, null = True) + value_bool = models.BooleanField(null=True) value_enum = models.ForeignKey( EnumValue,