diff --git a/bestilling/design/models.py b/bestilling/design/models.py
index e8811be..64516c1 100644
--- a/bestilling/design/models.py
+++ b/bestilling/design/models.py
@@ -12,7 +12,16 @@ class DesignOrder(Order):
('A6', 'A6 (105 x 148 mm)'),
]
- format_type = models.CharField(max_length=50)
+ FORMATS = [
+ ('Trykk - Flyer', 'Trykk - Flyer'),
+ ('Trykk - Plakat', 'Trykk - Plakat'),
+ ('Trykk - Banner', 'Trykk - Banner'),
+ ('Web - Annonse', 'Web - Annonse'),
+ ('Web - Banner', 'Web - Banner'),
+ ('Web - Bilde', 'Web - Bilde'),
+ ]
+
+ format_type = models.CharField(max_length=50, choices=FORMATS)
paper_size = models.CharField(max_length=50, choices=PAPER_SIZES)
colour = models.CharField(max_length=50)
marger = models.CharField(max_length=50)
diff --git a/bestilling/design/views.py b/bestilling/design/views.py
index bfeb5af..3202466 100644
--- a/bestilling/design/views.py
+++ b/bestilling/design/views.py
@@ -32,7 +32,8 @@ class DesignFormView(BaseFormView):
def _get_params(self):
params = super(DesignFormView, self)._get_params()
params.update({
- 'paper_sizes' : DesignOrder._meta.get_field('paper_size').choices
+ 'paper_sizes' : DesignOrder._meta.get_field('paper_size').choices,
+ 'format_types' : DesignOrder._meta.get_field('format_type').choices,
})
return params
diff --git a/bestilling/templates/design/form.html b/bestilling/templates/design/form.html
index 90843ff..8b68e2d 100644
--- a/bestilling/templates/design/form.html
+++ b/bestilling/templates/design/form.html
@@ -9,27 +9,13 @@
{% endif %}
+ {% for format_type_code, format_type_display in format_types %}
+ {% endfor %}
-
-
-
-
-
{% if errors.format_other_error %}