Fix cache issues

3 files changed, 40 insertions, 17 deletions

diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 48b198fe3..ce9175d10 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -93,8 +93,7 @@ class RecordFormGeneral(forms.Form):
     width = forms.IntegerField(label=_(u"Width (cm)"), required=False)
     thickness = forms.IntegerField(label=_(u"Thickness (cm)"), required=False)
     depth = forms.IntegerField(label=_(u"Depth (cm)"), required=False)
-    unit = forms.ChoiceField(label=_("Unit"), required=False,
-                             choices=models.Unit.get_types())
+    unit = forms.ChoiceField(label=_("Unit"), required=False, choices=[])
     location = forms.CharField(label=_(u"Location"), widget=forms.Textarea,
            required=False, validators=[validators.MaxLengthValidator(200)])
 
@@ -125,6 +124,8 @@ class RecordFormGeneral(forms.Form):
                 self.fields['parcel'].choices.append(
  (" - ".join(key), [(parcel.pk, parcel.short_label()) for parcel in gparcels])
                 )
+        self.fields['unit'].choices = models.Unit.get_types()
+        self.fields['unit'].help_text = models.Unit.get_help()
 
     def clean(self):
         # manage unique context record ID
@@ -146,18 +147,21 @@ class DatingForm(forms.Form):
     associated_models = {'dating_type':models.DatingType,
                          'quality':models.DatingQuality,
                          'period':models.Period}
-    period = forms.ChoiceField(label=_("Period"), choices=Period.get_types())
+    period = forms.ChoiceField(label=_("Period"), choices=[])
     start_date = forms.IntegerField(label=_(u"Start date"), required=False)
     end_date = forms.IntegerField(label=_(u"End date"), required=False)
-    quality = forms.ChoiceField(label=_("Quality"), required=False,
-                               choices=models.DatingQuality.get_types())
+    quality = forms.ChoiceField(label=_("Quality"), required=False, choices=[])
     dating_type = forms.ChoiceField(label=_("Dating type"), required=False,
-                               choices=[])
+                                    choices=[])
 
     def __init__(self, *args, **kwargs):
         super(DatingForm, self).__init__(*args, **kwargs)
         self.fields['dating_type'].choices = models.DatingType.get_types()
         self.fields['dating_type'].help_text = models.DatingType.get_help()
+        self.fields['quality'].choices = models.DatingQuality.get_types()
+        self.fields['quality'].help_text = models.DatingQuality.get_help()
+        self.fields['period'].choices = Period.get_types()
+        self.fields['period'].help_text = Period.get_help()
 
 
 DatingFormSet = formset_factory(DatingForm, can_delete=True,
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index ad5b3f614..27617f8ad 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -47,8 +47,7 @@ class FileSelect(TableSelect):
     towns = get_town_field()
     in_charge = get_person_field(label=_(u"Person in charge"),
                                  person_type='sra_agent')
-    file_type = forms.ChoiceField(label=_("File type"),
-                                  choices=models.FileType.get_types())
+    file_type = forms.ChoiceField(label=_("File type"), choices=[])
     saisine_type = forms.ChoiceField(label=_("Saisine type"), choices=[])
     year = forms.IntegerField(label=_("Year"))
     parcel = ParcelField(label=_("Parcel (section/number)"))
@@ -57,6 +56,8 @@ class FileSelect(TableSelect):
         super(FileSelect, self).__init__(*args, **kwargs)
         self.fields['saisine_type'].choices = models.SaisineType.get_types()
         self.fields['saisine_type'].help_text = models.SaisineType.get_help()
+        self.fields['file_type'].choices = models.FileType.get_types()
+        self.fields['file_type'].help_text = models.FileType.get_help()
 
     def get_input_ids(self):
         ids = super(FileSelect, self).get_input_ids()
@@ -102,8 +103,7 @@ class FileFormGeneral(forms.Form):
     name = forms.CharField(label=_(u"Name"), required=False)
     creation_date = forms.DateField(label=_(u"Creation date"),
                                     initial=get_now, widget=widgets.JQueryDate)
-    file_type = forms.ChoiceField(label=_("File type"),
-                                  choices=models.FileType.get_types())
+    file_type = forms.ChoiceField(label=_("File type"), choices=[])
     related_file = forms.IntegerField(label=_("Related file"), required=False,
          widget=widgets.JQueryAutoComplete(reverse_lazy('autocomplete-file'),
                                            associated_model=models.File),
@@ -111,6 +111,11 @@ class FileFormGeneral(forms.Form):
     comment = forms.CharField(label=_(u"Comment"), widget=forms.Textarea,
                               required=False)
 
+    def __init__(self, *args, **kwargs):
+        super(FileFormGeneral, self).__init__(*args, **kwargs)
+        self.fields['file_type'].choices = models.FileType.get_types()
+        self.fields['file_type'].help_text = models.FileType.get_help()
+
 class FileFormGeneralRO(FileFormGeneral):
     year = forms.IntegerField(label=_(u"Year"),
                         widget=forms.TextInput(attrs={'readonly':True}))
@@ -153,7 +158,7 @@ class FileFormPreventive(forms.Form):
                 associated_model=Organization, new=True),
             validators=[valid_id(Organization)])
     permit_type = forms.ChoiceField(label=_(u"Permit type"), required=False,
-                                  choices=models.PermitType.get_types())
+                                    choices=[])
     permit_reference = forms.CharField(label=_(u"Permit reference"),
             required=False, validators=[validators.MaxLengthValidator(60)])
     total_developed_surface = forms.IntegerField(widget=widgets.AreaWidget,
@@ -169,6 +174,8 @@ class FileFormPreventive(forms.Form):
         super(FileFormPreventive, self).__init__(*args, **kwargs)
         self.fields['saisine_type'].choices = models.SaisineType.get_types()
         self.fields['saisine_type'].help_text = models.SaisineType.get_help()
+        self.fields['permit_type'].choices = models.PermitType.get_types()
+        self.fields['permit_type'].help_text = models.PermitType.get_help()
 
 
 class FinalFileClosingForm(FinalForm):
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index cbdade3b2..1fc081ea4 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -124,10 +124,8 @@ class OperationSelect(TableSelect):
          [unicode(PersonType.objects.get(txt_idx='head_scientist').pk),
           unicode(PersonType.objects.get(txt_idx='sra_agent').pk)])]),
         associated_model=Person, new=True), label=_(u"In charge"))
-    remains = forms.ChoiceField(label=_(u"Remains"),
-                                choices=models.RemainType.get_types())
-    periods = forms.ChoiceField(label=_(u"Periods"),
-                                choices=models.Period.get_types())
+    remains = forms.ChoiceField(label=_(u"Remains"), choices=[])
+    periods = forms.ChoiceField(label=_(u"Periods"), choices=[])
     year = forms.IntegerField(label=_("Year"))
     start_before = forms.DateField(label=_(u"Started before"),
                                    widget=widgets.JQueryDate)
@@ -144,6 +142,10 @@ class OperationSelect(TableSelect):
         super(OperationSelect, self).__init__(*args, **kwargs)
         self.fields['operation_type'].choices = models.OperationType.get_types()
         self.fields['operation_type'].help_text = models.OperationType.get_help()
+        self.fields['remains'].choices = models.RemainType.get_types()
+        self.fields['remains'].help_text = models.RemainType.get_help()
+        self.fields['periods'].choices = models.Period.get_types()
+        self.fields['periods'].help_text = models.Period.get_help()
 
     def get_input_ids(self):
         ids = super(OperationSelect, self).get_input_ids()
@@ -369,7 +371,12 @@ class RemainForm(forms.Form):
     base_model = 'remain'
     associated_models = {'remain':models.RemainType}
     remain = forms.ChoiceField(label=_("Remain type"), required=False,
-                                       choices=models.RemainType.get_types())
+                               choices=[])
+
+    def __init__(self, *args, **kwargs):
+        super(RemainForm, self).__init__(*args, **kwargs)
+        self.fields['remain'].choices = models.RemainType.get_types()
+        self.fields['remain'].help_text = models.RemainType.get_help()
 
 class RemainFormSet(FormSet):
     def clean(self):
@@ -386,7 +393,12 @@ class PeriodForm(forms.Form):
     base_model = 'period'
     associated_models = {'period':models.Period}
     period = forms.ChoiceField(label=_("Period"), required=False,
-                                       choices=models.Period.get_types())
+                               choices=[])
+
+    def __init__(self, *args, **kwargs):
+        super(PeriodForm, self).__init__(*args, **kwargs)
+        self.fields['period'].choices = models.Period.get_types()
+        self.fields['period'].help_text = models.Period.get_help()
 
 class PeriodFormSet(FormSet):
     def clean(self):