diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-10-06 00:31:12 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-10-06 00:31:12 +0200 |
| commit | 4b1349b748e8dbd1ace541cc55562dba6bd9fe6f (patch) | |
| tree | a5bed9314cdb19324f84e9a208f3e36c4322ec21 /archaeological_context_records | |
| parent | 3137698e03d80f982c9f1cc6f319ce6ca9a2f5d6 (diff) | |
| download | Ishtar-4b1349b748e8dbd1ace541cc55562dba6bd9fe6f.tar.bz2 Ishtar-4b1349b748e8dbd1ace541cc55562dba6bd9fe6f.zip | |
Specific context record table for operation window
Diffstat (limited to 'archaeological_context_records')
| -rw-r--r-- | archaeological_context_records/models.py | 3 | ||||
| -rw-r--r-- | archaeological_context_records/urls.py | 3 | ||||
| -rw-r--r-- | archaeological_context_records/views.py | 14 |
3 files changed, 20 insertions, 0 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index d86d4aaa9..8c80d81ed 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -110,6 +110,9 @@ class ContextRecord(BaseHistorizedItem, OwnPerms, ShortMenuItem): 'label', 'unit'] if settings.COUNTRY == 'fr': TABLE_COLS.insert(1, 'operation.code_patriarche') + TABLE_COLS_FOR_OPE = [ + 'label', ['parcel.section', 'parcel.parcel_number'], 'unit', + 'datings.period', 'description'] external_id = models.CharField(_(u"External ID"), blank=True, null=True, max_length=120) parcel = models.ForeignKey(Parcel, verbose_name=_(u"Parcel"), diff --git a/archaeological_context_records/urls.py b/archaeological_context_records/urls.py index 7e7adb937..098542fa0 100644 --- a/archaeological_context_records/urls.py +++ b/archaeological_context_records/urls.py @@ -55,6 +55,9 @@ urlpatterns += patterns( 'revert_contextrecord', name='revert-contextrecord'), url(r'get-contextrecord/(?P<type>.+)?$', 'get_contextrecord', name='get-contextrecord'), + url(r'get-contextrecord-for-ope/(?P<type>.+)?$', + 'get_contextrecord_for_ope', + name='get-contextrecord-for-ope'), url(r'get-contextrecord-full/(?P<type>.+)?$', 'get_contextrecord', name='get-contextrecord-full', kwargs={'full': True}), diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py index 483630b3c..d64adc2a2 100644 --- a/archaeological_context_records/views.py +++ b/archaeological_context_records/views.py @@ -43,6 +43,20 @@ get_contextrecord = get_item( 'parcel_1': 'operation__parcels__parcel_number', 'label': 'label__icontains' },) +get_contextrecord_for_ope = get_item( + models.ContextRecord, + 'get_contextrecord', 'contextrecord', + extra_request_keys={ + 'parcel__town': 'parcel__town__pk', + 'operation__year': 'operation__year__contains', + 'operation__code_patriarche': 'operation__code_patriarche', + 'operation__operation_code': 'operation__operation_code', + 'datings__period': 'datings__period__pk', + 'parcel_0': 'operation__parcels__section', + 'parcel_1': 'operation__parcels__parcel_number', + 'label': 'label__icontains' + }, + own_table_cols=models.ContextRecord.TABLE_COLS_FOR_OPE) get_contextrecordsource = get_item( models.ContextRecordSource, 'get_contextrecordsource', 'contextrecordsource', |