Skip to content

Commit

Permalink
rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
Floris272 committed Sep 3, 2024
1 parent e8af619 commit be49dd2
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 48 deletions.
2 changes: 1 addition & 1 deletion src/open_producten/products/tests/test_data_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from open_producten.products.models import Product
from open_producten.producttypes.models import FieldTypes
from open_producten.producttypes.tests.factories import FieldFactory, ProductTypeFactory
from open_producten.utils.tests.test_helpers import build_formset_data
from open_producten.utils.tests.helpers import build_formset_data

from ..admin.data import DataInlineFormSet
from ..models import Data
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# Generated by Django 4.2.13 on 2024-08-20 12:13

from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("producttypes", "0002_remove_condition_rule_alter_field_description_and_more"),
]
Expand Down Expand Up @@ -46,4 +45,36 @@ class Migration(migrations.Migration):
verbose_name="Type",
),
),
migrations.AlterField(
model_name="field",
name="type",
field=models.CharField(
choices=[
("bsn", "Bsn"),
("checkbox", "Checkbox"),
("Cosign", "Cosign"),
("currency", "Currency"),
("date", "Date"),
("datetime", "Datetime"),
("email", "Email"),
("iban", "Iban"),
("licenseplate", "License Plate"),
("map", "Map"),
("number", "Number"),
("password", "Password"),
("phoneNumber", "Phone Number"),
("postcode", "Postcode"),
("radio", "Radio"),
("select", "Select"),
("selectBoxes", "Select Boxes"),
("signature", "Signature"),
("textfield", "Textfield"),
("time", "Time"),
],
default="textfield",
help_text="The formio type of the field",
max_length=255,
verbose_name="Type",
),
),
]

0 comments on commit be49dd2

Please sign in to comment.