Add validators

This commit is contained in:
Edgar P. Burkhart 2022-05-20 16:27:18 +02:00
parent c91994d041
commit 9e7563e38e
Signed by: edpibu
GPG key ID: 9833D3C5A25BD227
4 changed files with 20 additions and 15 deletions

View file

@ -6,18 +6,18 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('main', '0003_category_parent_alter_category_name'), ("main", "0003_category_parent_alter_category_name"),
] ]
operations = [ operations = [
migrations.AlterModelOptions( migrations.AlterModelOptions(
name='category', name="category",
options={'ordering': ['-parent_id', 'name']}, options={"ordering": ["-parent_id", "name"]},
), ),
migrations.AddField( migrations.AddField(
model_name='category', model_name="category",
name='full_name', name="full_name",
field=models.CharField(default='', max_length=512), field=models.CharField(default="", max_length=512),
preserve_default=False, preserve_default=False,
), ),
] ]

View file

@ -6,13 +6,13 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('main', '0004_alter_category_options_category_full_name'), ("main", "0004_alter_category_options_category_full_name"),
] ]
operations = [ operations = [
migrations.AlterField( migrations.AlterField(
model_name='category', model_name="category",
name='full_name', name="full_name",
field=models.CharField(default='', editable=False, max_length=512), field=models.CharField(default="", editable=False, max_length=512),
), ),
] ]

View file

@ -1,16 +1,18 @@
import uuid import uuid
from django.db import models from django.db import models
from django.forms import ModelForm from django.forms import ModelForm
from django.core.validators import validate_unicode_slug, FileExtensionValidator
class Category(models.Model): class Category(models.Model):
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
name = models.CharField(max_length=64) name = models.CharField(max_length=64, validators=[validate_unicode_slug])
full_name = models.CharField(max_length=512, editable=False, default="") full_name = models.CharField(max_length=512, editable=False, default="")
parent = models.ForeignKey("self", on_delete=models.SET_NULL, blank=True, null=True) parent = models.ForeignKey("self", on_delete=models.SET_NULL, blank=True, null=True)
def __str__(self): def __str__(self):
if self.parent is None: return self.name if self.parent is None:
return self.name
return f"{self.parent}>{self.name}" return f"{self.parent}>{self.name}"
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
@ -20,7 +22,7 @@ class Category(models.Model):
child.save() child.save()
class Meta: class Meta:
ordering = ['full_name'] ordering = ["full_name"]
class Transaction(models.Model): class Transaction(models.Model):
@ -49,7 +51,9 @@ class TransactionForm(ModelForm):
class Invoice(models.Model): class Invoice(models.Model):
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
name = models.CharField(max_length=256) name = models.CharField(max_length=256)
file = models.FileField(upload_to="invoices/") file = models.FileField(
upload_to="invoices/", validators=[FileExtensionValidator(["pdf"])]
)
transaction = models.ForeignKey(Transaction, on_delete=models.CASCADE) transaction = models.ForeignKey(Transaction, on_delete=models.CASCADE)
def __str__(self): def __str__(self):

View file

@ -15,7 +15,8 @@ def index(request):
children = [] children = []
for child in Category.objects.filter(parent=cat): for child in Category.objects.filter(parent=cat):
children += _cat_list(child) children += _cat_list(child)
if len(children) == 0: return cat.name, if len(children) == 0:
return (cat.name,)
return cat.name, children return cat.name, children
_cats = [] _cats = []