diff options
Diffstat (limited to 'archaeological_files/views.py')
| -rw-r--r-- | archaeological_files/views.py | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/archaeological_files/views.py b/archaeological_files/views.py index eeae4fa78..71494c8f5 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/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-2014 É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 @@ -28,11 +28,10 @@ from django.utils.translation import ugettext_lazy as _ from ishtar_common.views import get_item, show_item, revert_item from ishtar_common.models import Person -from archaeological_operations.models import AdministrativeAct import models from ishtar_common.wizards import SearchWizard -from archaeological_operations.wizards import is_preventive +from archaeological_operations.wizards import is_preventive, is_not_preventive from wizards import * from ishtar_common.forms_common import TownFormset @@ -115,12 +114,17 @@ file_creation_wizard = FileWizard.as_view([ ('towns-file_creation', TownFormset), ('parcels-file_creation', ParcelFormSet), ('preventive-file_creation', FileFormPreventive), + ('research-file_creation', FileFormResearch), ('final-file_creation', FinalForm)], label=_(u"New file"), - condition_dict={'preventive-file_creation':is_preventive( - 'general-file_creation', - models.FileType, type_key='file_type') - }, + condition_dict={ + 'preventive-file_creation':\ + is_preventive( 'general-file_creation', models.FileType, + type_key='file_type'), + 'research-operation_creation':\ + is_not_preventive('general-file_creation', models.FileType, + type_key='file_type'), + }, url_name='file_creation',) file_modification_wizard = FileModificationWizard.as_view([ @@ -129,11 +133,16 @@ file_modification_wizard = FileModificationWizard.as_view([ ('towns-file_modification', TownFormset), ('parcels-file_modification', ParcelFormSet), ('preventive-file_modification', FileFormPreventive), + ('research-file_modification', FileFormResearch), ('final-file_modification', FinalForm)], label=_(u"File modification"), - condition_dict={'preventive-file_modification':is_preventive( - 'general-file_modification', - models.FileType, type_key='file_type') + condition_dict={ + 'preventive-file_modification':\ + is_preventive('general-file_modification', + models.FileType, type_key='file_type'), + 'research-file_modification':\ + is_not_preventive('general-file_modification', + models.FileType, type_key='file_type'), }, url_name='file_modification',) |