Use name validator on correct model, oops
This commit is contained in:
parent
172bdd7261
commit
33b82af67d
2 changed files with 38 additions and 4 deletions
|
@ -0,0 +1,34 @@
|
||||||
|
# Generated by Django 5.2b1 on 2025-03-28 11:51
|
||||||
|
|
||||||
|
import django.core.validators
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("core", "0010_service_instance"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="servicecategory",
|
||||||
|
name="name",
|
||||||
|
field=models.CharField(max_length=100, verbose_name="Name"),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="serviceinstance",
|
||||||
|
name="name",
|
||||||
|
field=models.CharField(
|
||||||
|
max_length=63,
|
||||||
|
validators=[
|
||||||
|
django.core.validators.RegexValidator(
|
||||||
|
code="invalid_kubernetes_name",
|
||||||
|
message='Name must consist of lowercase alphanumeric characters or "-", must start and end with an alphanumeric character.',
|
||||||
|
regex="^[a-z0-9]([-a-z0-9]*[a-z0-9])?$",
|
||||||
|
)
|
||||||
|
],
|
||||||
|
verbose_name="Name",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
|
@ -17,9 +17,7 @@ class ServiceCategory(ServalaModelMixin, models.Model):
|
||||||
Categories for services, e.g. "Databases", "Storage", "Compute".
|
Categories for services, e.g. "Databases", "Storage", "Compute".
|
||||||
"""
|
"""
|
||||||
|
|
||||||
name = models.CharField(
|
name = models.CharField(max_length=100, verbose_name=_("Name"))
|
||||||
max_length=100, verbose_name=_("Name"), validators=[kubernetes_name_validator]
|
|
||||||
)
|
|
||||||
description = models.TextField(blank=True, verbose_name=_("Description"))
|
description = models.TextField(blank=True, verbose_name=_("Description"))
|
||||||
logo = models.ImageField(
|
logo = models.ImageField(
|
||||||
upload_to="public/service_categories",
|
upload_to="public/service_categories",
|
||||||
|
@ -416,7 +414,9 @@ class ServiceInstance(ServalaModelMixin, models.Model):
|
||||||
on the fly.
|
on the fly.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
name = models.CharField(max_length=100, verbose_name=_("Name"))
|
name = models.CharField(
|
||||||
|
max_length=63, verbose_name=_("Name"), validators=[kubernetes_name_validator]
|
||||||
|
)
|
||||||
organization = models.ForeignKey(
|
organization = models.ForeignKey(
|
||||||
to="core.Organization",
|
to="core.Organization",
|
||||||
on_delete=models.PROTECT,
|
on_delete=models.PROTECT,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue