Fix cache issues

1 files changed, 18 insertions, 6 deletions

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):