Merge branch 'v0.9' into wheezy

1 files changed, 10 insertions, 8 deletions

diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py
index a182d0f0e..99dc97137 100644
--- a/archaeological_files_pdl/forms.py
+++ b/archaeological_files_pdl/forms.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2015 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2014-2016 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -27,7 +27,7 @@ from django.utils.translation import ugettext_lazy as _
 from ishtar_common.models import Person, Town, Department, valid_id
 from archaeological_files import models
 
-from ishtar_common.forms import get_now, reverse_lazy
+from ishtar_common.forms import get_now, reverse_lazy, ManageOldType
 from archaeological_files.forms import GENERAL_CONTRACTOR, \
     GENERAL_CONTRACTOR_ORGA, RESPONSIBLE_PLANNING_SERVICE, \
     RESPONSIBLE_PLANNING_SERVICE_ORGA
@@ -37,7 +37,7 @@ from archaeological_operations.forms import SRA_AGENT
 from ishtar_common import widgets
 
 
-class FileFormGeneral(forms.Form):
+class FileFormGeneral(ManageOldType, forms.Form):
     form_label = _("General")
     associated_models = {'file_type': models.FileType}
     file_type = forms.ChoiceField(label=_("File type"), choices=[])
@@ -52,7 +52,8 @@ class FileFormGeneral(forms.Form):
 
     def __init__(self, *args, **kwargs):
         super(FileFormGeneral, self).__init__(*args, **kwargs)
-        self.fields['file_type'].choices = models.FileType.get_types()
+        self.fields['file_type'].choices = models.FileType.get_types(
+            initial=self.init_data.get('file_type'))
         self.fields['file_type'].help_text = models.FileType.get_help()
 
     def clean_reception_date(self):
@@ -63,7 +64,7 @@ class FileFormGeneral(forms.Form):
         return value
 
 
-class FileFormPreventiveType(forms.Form):
+class FileFormPreventiveType(ManageOldType, forms.Form):
     form_label = u"Saisine"
     associated_models = {'saisine_type': models.SaisineType,
                          'permit_type': models.PermitType}
@@ -74,10 +75,11 @@ class FileFormPreventiveType(forms.Form):
 
     def __init__(self, *args, **kwargs):
         super(FileFormPreventiveType, self).__init__(*args, **kwargs)
-        self.fields['saisine_type'].choices = models.SaisineType.get_types()
+        self.fields['saisine_type'].choices = models.SaisineType.get_types(
+            initial=self.init_data.get('saisine_type'))
         self.fields['saisine_type'].help_text = models.SaisineType.get_help()
-        self.fields['permit_type'].choices = \
-            models.PermitType.get_types(default='NP')
+        self.fields['permit_type'].choices = models.PermitType.get_types(
+            default='NP', initial=self.init_data.get('permit_type'))
         self.fields['permit_type'].help_text = models.PermitType.get_help()