Adapt context record forms

2 files changed, 17 insertions, 1 deletions

diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index ea47be311..b2bf9f39b 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -115,6 +115,7 @@ class RecordSelect(TableSelect):
 
 class RecordFormSelection(forms.Form):
     form_label = _("Context record search")
+    SEARCH_AND_SELECT = True
     associated_models = {'pk': models.ContextRecord}
     currents = {'pk': models.ContextRecord}
     pk = forms.IntegerField(
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index 71e8330b7..5e9d63652 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -42,6 +42,8 @@ class DatingType(GeneralType):
         verbose_name = _(u"Dating type")
         verbose_name_plural = _(u"Dating types")
         ordering = ('label',)
+
+
 post_save.connect(post_save_cache, sender=DatingType)
 post_delete.connect(post_save_cache, sender=DatingType)
 
@@ -51,6 +53,8 @@ class DatingQuality(GeneralType):
         verbose_name = _(u"Dating quality type")
         verbose_name_plural = _(u"Dating quality types")
         ordering = ('label',)
+
+
 post_save.connect(post_save_cache, sender=DatingQuality)
 post_delete.connect(post_save_cache, sender=DatingQuality)
 
@@ -119,6 +123,8 @@ class Unit(GeneralType):
 
     def __unicode__(self):
         return self.label
+
+
 post_save.connect(post_save_cache, sender=Unit)
 post_delete.connect(post_save_cache, sender=Unit)
 
@@ -133,6 +139,8 @@ class ActivityType(GeneralType):
 
     def __unicode__(self):
         return self.label
+
+
 post_save.connect(post_save_cache, sender=ActivityType)
 post_delete.connect(post_save_cache, sender=ActivityType)
 
@@ -147,6 +155,8 @@ class IdentificationType(GeneralType):
 
     def __unicode__(self):
         return self.label
+
+
 post_save.connect(post_save_cache, sender=IdentificationType)
 post_delete.connect(post_save_cache, sender=IdentificationType)
 
@@ -156,6 +166,8 @@ class ExcavationTechnicType(GeneralType):
         verbose_name = _(u"Excavation technique type")
         verbose_name_plural = _(u"Excavation technique types")
         ordering = ('label',)
+
+
 post_save.connect(post_save_cache, sender=ExcavationTechnicType)
 post_delete.connect(post_save_cache, sender=ExcavationTechnicType)
 
@@ -165,6 +177,8 @@ class DocumentationType(GeneralType):
         verbose_name = _(u"Documentation type")
         verbose_name_plural = _(u"Documentation types")
         ordering = ('label',)
+
+
 post_save.connect(post_save_cache, sender=DocumentationType)
 post_delete.connect(post_save_cache, sender=DocumentationType)
 
@@ -196,7 +210,7 @@ class ContextRecord(BulkUpdatedItem, BaseHistorizedItem,
     EXTERNAL_ID_KEY = 'context_record_external_id'
     EXTERNAL_ID_DEPENDENCIES = ['base_finds']
     TABLE_COLS = ['label', 'operation__common_name', 'parcel__town__name',
-                  'parcel__label', 'unit']
+                  'parcel__short_label', 'unit']
     if settings.COUNTRY == 'fr':
         TABLE_COLS.insert(1, 'operation__code_patriarche')
     TABLE_COLS_FOR_OPE = ['label', 'parcel', 'unit',
@@ -222,6 +236,7 @@ class ContextRecord(BulkUpdatedItem, BaseHistorizedItem,
     # search parameters
     EXTRA_REQUEST_KEYS = {
         'parcel__town': 'parcel__town__pk',
+        'parcel__short_label': 'parcel__short_label',
         'operation__year': 'operation__year__contains',
         'year': 'operation__year__contains',
         'operation__code_patriarche': 'operation__code_patriarche',