Skip to content

Commit

Permalink
Merge pull request #5075 from open-formulieren/issue/5024-remove-uppe…
Browse files Browse the repository at this point in the history
…rcase-validation

[#5024] Remove uppercase validation of Domain in ZGW registration backend
  • Loading branch information
sergei-maertens authored Feb 5, 2025
2 parents c70e33f + a6e3f2f commit a201a2a
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 4.2.18 on 2025-02-03 20:21

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("objects_api", "0005_alter_objectsapigroupconfig_table"),
]

operations = [
migrations.AlterField(
model_name="objectsapigroupconfig",
name="catalogue_domain",
field=models.CharField(
blank=True,
help_text="The 'domein' attribute for the Catalogus resource in the Catalogi API.",
max_length=5,
verbose_name="catalogus domain",
),
),
]
3 changes: 1 addition & 2 deletions src/openforms/contrib/objects_api/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from zgw_consumers.constants import APITypes

from openforms.utils.validators import RSINValidator, validate_rsin, validate_uppercase
from openforms.utils.validators import RSINValidator, validate_rsin

# no catalogus specified, requires both RSIN and domain to be unspecified
_CATALOGUE_NOT_SET = models.Q(catalogue_domain="", catalogue_rsin="")
Expand Down Expand Up @@ -75,7 +75,6 @@ class ObjectsAPIGroupConfig(models.Model):
help_text=_(
"The 'domein' attribute for the Catalogus resource in the Catalogi API."
),
validators=[validate_uppercase],
)
catalogue_rsin = models.CharField(
_("catalogus RSIN"),
Expand Down
3 changes: 1 addition & 2 deletions src/openforms/contrib/zgw/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from rest_framework import serializers

from openforms.api.validators import AllOrNoneTruthyFieldsValidator
from openforms.utils.validators import RSINValidator, validate_uppercase
from openforms.utils.validators import RSINValidator


class CatalogueSerializer(serializers.Serializer):
Expand All @@ -29,7 +29,6 @@ class CatalogueSerializer(serializers.Serializer):
"The 'domein' attribute for the Catalogus resource in the Catalogi API."
),
default="",
validators=[validate_uppercase],
allow_blank=True,
)
rsin = serializers.CharField(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 4.2.18 on 2025-02-03 20:21

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("zgw_apis", "0018_alter_zgwapigroupconfig_drc_service_and_more"),
]

operations = [
migrations.AlterField(
model_name="zgwapigroupconfig",
name="catalogue_domain",
field=models.CharField(
blank=True,
help_text="The 'domein' attribute for the Catalogus resource in the Catalogi API.",
max_length=5,
verbose_name="catalogus domain",
),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Generated by Django 4.2.18 on 2025-02-04 11:09

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
("zgw_apis", "0019_alter_zgwapigroupconfig_auteur"),
("zgw_apis", "0019_alter_zgwapigroupconfig_catalogue_domain"),
]

operations = []
3 changes: 1 addition & 2 deletions src/openforms/registrations/contrib/zgw_apis/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from zgw_consumers.constants import APITypes

from openforms.template.validators import DjangoTemplateValidator
from openforms.utils.validators import RSINValidator, validate_rsin, validate_uppercase
from openforms.utils.validators import RSINValidator, validate_rsin


def get_content_text() -> str:
Expand Down Expand Up @@ -98,7 +98,6 @@ class ZGWApiGroupConfig(models.Model):
help_text=_(
"The 'domein' attribute for the Catalogus resource in the Catalogi API."
),
validators=[validate_uppercase],
)
catalogue_rsin = models.CharField(
_("catalogus RSIN"),
Expand Down
7 changes: 0 additions & 7 deletions src/openforms/utils/validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@
)


validate_uppercase = RegexValidator(
r"^[A-Z]*$",
message=_("Value must be all uppercase letters."),
code="invalid",
)


class Proef11ValidatorBase:
value_size = NotImplemented
error_messages = {
Expand Down

0 comments on commit a201a2a

Please sign in to comment.