summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ishtar/furnitures/forms.py6
-rw-r--r--ishtar/furnitures/models.py3
2 files changed, 8 insertions, 1 deletions
diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py
index 588d3b2de..3753d5cda 100644
--- a/ishtar/furnitures/forms.py
+++ b/ishtar/furnitures/forms.py
@@ -83,6 +83,9 @@ class Wizard(NamedUrlSessionFormWizard):
return context
def get_formated_datas(self, forms):
+ """
+ Get the data to present in the last page
+ """
datas = []
for form in forms:
base_form = hasattr(form, 'forms') and form.forms[0] or form
@@ -106,6 +109,9 @@ class Wizard(NamedUrlSessionFormWizard):
return datas
def done(self, request, storage, form_list, **kwargs):
+ """
+ Save to the model
+ """
dct, m2m = {}, []
for form in form_list:
base_form = hasattr(form, 'forms') and form.forms[0] or form
diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py
index 65258c65d..86d5e2634 100644
--- a/ishtar/furnitures/models.py
+++ b/ishtar/furnitures/models.py
@@ -569,7 +569,8 @@ class Town(models.Model):
center = models.PointField(_(u"Localisation"), srid=settings.SRID)
if settings.COUNTRY == 'fr':
numero_insee = models.CharField(u"Numéro INSEE", max_length=5)
- canton = models.ForeignKey(Canton, verbose_name=u"Canton")
+ canton = models.ForeignKey(Canton, verbose_name=u"Canton", null=True,
+ blank=True)
objects = models.GeoManager()
class Meta: