diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-23 11:07:45 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-23 11:07:45 +0200 |
| commit | 7924c43af9044cfd40f36bd8a84378417223d95b (patch) | |
| tree | 78197ea5c36baaff4fcc1a53580eb3d586630b39 /archaeological_context_records/views.py | |
| parent | 54b87741a26a2bd805ed32200b082ca07ee0e27d (diff) | |
| parent | 0bdaa7c90017b436b3baf026c9710a8d49c9420a (diff) | |
| download | Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.tar.bz2 Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.zip | |
Merge branch 'master' into v0.9
Conflicts:
ishtar_common/migrations/0053_auto__add_field_ishtarsiteprofile_currency.py
Diffstat (limited to 'archaeological_context_records/views.py')
| -rw-r--r-- | archaeological_context_records/views.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py index c76413977..3e808c06b 100644 --- a/archaeological_context_records/views.py +++ b/archaeological_context_records/views.py @@ -43,6 +43,7 @@ contextrecord_extra_keys = { 'datings__period': 'datings__period__pk', 'parcel_0': 'operation__parcels__section', 'parcel_1': 'operation__parcels__parcel_number', + 'parcel_2': 'operation__parcels__public_domain', 'label': 'label__icontains', 'archaeological_sites': 'operation__archaeological_sites__pk', } @@ -79,6 +80,7 @@ def autocomplete_contextrecord(request): get_contextrecord = get_item( models.ContextRecord, 'get_contextrecord', 'contextrecord', + relation_types_prefix={'ope_relation_types': 'operation__'}, extra_request_keys=contextrecord_extra_keys,) get_contextrecord_for_ope = get_item( models.ContextRecord, @@ -97,9 +99,14 @@ get_contextrecordsource = get_item( 'title': 'title__icontains', 'description': 'description__icontains', 'comment': 'comment__icontains', + 'person': 'authors__person__pk', 'additional_information': 'additional_information__icontains', 'context_record__parcel__town': 'context_record__parcel__town__pk', 'context_record__operation__year': 'context_record__operation__year', + 'context_record__operation__operation_code': + 'context_record__operation__operation_code', + 'context_record__operation__code_patriarche': + 'context_record__operation__code_patriarche', 'context_record__operation': 'context_record__operation__pk', 'context_record__datings__period': 'context_record__datings__period__pk', @@ -145,6 +152,11 @@ record_deletion_wizard = RecordDeletionWizard.as_view([ label=_(u"Context record deletion"), url_name='record_deletion',) +record_source_search_wizard = SearchWizard.as_view([ + ('selec-record_source_search', RecordSourceFormSelection)], + label=_(u"Context record: source search"), + url_name='record_source_search',) + record_source_creation_wizard = RecordSourceWizard.as_view([ ('selec-record_source_creation', SourceRecordFormSelection), ('source-record_source_creation', SourceForm), |