Adjust context record selection (closes #312)

1 files changed, 10 insertions, 8 deletions

diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py
index c6d10787e..769e5d509 100644
--- a/ishtar/furnitures/forms.py
+++ b/ishtar/furnitures/forms.py
@@ -1967,12 +1967,13 @@ class DateForm(forms.Form):
                          'dating__period':models.Period}
     dating__period = forms.ChoiceField(label=_("Period"),
                                choices=models.Period.get_types())
-    dating__start_date = forms.IntegerField(label=_(u"Start date"))
-    dating__end_date = forms.IntegerField(label=_(u"End date"))
-    dating__dating_type = forms.ChoiceField(label=_("Dating type"),
-                               choices=models.DatingType.get_types())
-    dating__quality = forms.ChoiceField(label=_("Quality"),
+    dating__start_date = forms.IntegerField(label=_(u"Start date"),
+                                            required=False)
+    dating__end_date = forms.IntegerField(label=_(u"End date"), required=False)
+    dating__quality = forms.ChoiceField(label=_("Quality"), required=False,
                                choices=models.DatingQuality.get_types())
+    dating__dating_type = forms.ChoiceField(label=_("Dating type"),
+                required=False, choices=models.DatingType.get_types())
 
 item_creation_wizard = ItemWizard([
     ('selecrecord-item_creation', RecordFormSelection),
@@ -1987,12 +1988,13 @@ class ItemSelect(forms.Form):
          widget=widgets.JQueryAutoComplete("/" + settings.URL_PATH + \
                      'autocomplete-town', associated_model=models.Town),
          validators=[models.valid_id(models.Town)], label=_(u"Town"))
-    base_items__context_record__parcel__year = forms.IntegerField(
+    base_items__context_record__parcel__operation__year = forms.IntegerField(
                                                              label=_("Year"))
-    material_type = forms.ChoiceField(
-            label=_("Material type"), choices=models.MaterialType.get_types())
     dating__period = forms.ChoiceField(
             label=_("Period"), choices=models.Period.get_types())
+    material_type = forms.ChoiceField(
+            label=_("Material type"), choices=models.MaterialType.get_types())
+    base_items__is_isolated = forms.NullBooleanField(label=_("Is isolated?"))
 
 class ItemFormSelection(forms.Form):
     form_label = _("Item")