diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2016-01-10 15:35:51 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2016-01-10 15:35:51 +0100 |
| commit | 9de20f503852855b5dda8723693c5d156232d16d (patch) | |
| tree | 8d8e7c09faf179b2fed07878d1cf450a245a78d0 /archaeological_context_records/views.py | |
| parent | 5e0b683ccc3851a4092e4d459a43fb557299d47e (diff) | |
| parent | 23622f70dc4b6b544dcd99994e46ea20ff309777 (diff) | |
| download | Ishtar-9de20f503852855b5dda8723693c5d156232d16d.tar.bz2 Ishtar-9de20f503852855b5dda8723693c5d156232d16d.zip | |
Merge branch 'master' into master-land-planner-2999
Diffstat (limited to 'archaeological_context_records/views.py')
| -rw-r--r-- | archaeological_context_records/views.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py index cbf34ee07..13375f866 100644 --- a/archaeological_context_records/views.py +++ b/archaeological_context_records/views.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2013 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2010-2015 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -51,9 +51,14 @@ get_contextrecord_for_ope = get_item( 'get_contextrecord', 'contextrecord', extra_request_keys=contextrecord_extra_keys, own_table_cols=models.ContextRecord.TABLE_COLS_FOR_OPE) + +show_contextrecordsource = show_item(models.ContextRecordSource, + 'contextrecordsource') + get_contextrecordsource = get_item( models.ContextRecordSource, 'get_contextrecordsource', 'contextrecordsource', + bool_fields=['duplicate'], extra_request_keys={ 'context_record__parcel__town': 'context_record__parcel__town__pk', 'context_record__operation__year': 'context_record__operation__year', @@ -73,6 +78,7 @@ record_creation_wizard = RecordWizard.as_view([ ('general-record_creation', RecordFormGeneral), ('datings-record_creation', DatingFormSet), ('interpretation-record_creation', RecordFormInterpretation), + ('relations-record_creation', RecordRelationsFormSet), ('final-record_creation', FinalForm)], label=_(u"New context record"), url_name='record_creation',) @@ -82,6 +88,7 @@ record_modification_wizard = RecordModifWizard.as_view([ ('general-record_modification', RecordFormGeneral), ('datings-record_modification', DatingFormSet), ('interpretation-record_modification', RecordFormInterpretation), + ('relations-record_creation', RecordRelationsFormSet), ('final-record_modification', FinalForm)], label=_(u"Context record modification"), url_name='record_modification',) |