From 7343c9f1bbc28be270b2093dcd9e713a7bdcdb89 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 1 Jun 2018 15:50:52 +0200 Subject: Adapt forms, wizards, views, urls for new management of documents (refs #4107) --- archaeological_operations/views.py | 71 ++++---------------------------------- 1 file changed, 7 insertions(+), 64 deletions(-) (limited to 'archaeological_operations/views.py') diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index ea863bb36..97824843f 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -26,12 +26,7 @@ from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render, redirect from django.utils.translation import ugettext_lazy as _, pgettext_lazy -from ishtar_common.models import get_current_profile, IshtarSiteProfile from archaeological_operations import models - -from ishtar_common.forms import ClosingDateFormSelection, FinalForm, \ - FinalDeleteForm -from ishtar_common.forms_common import AuthorFormset, SourceDeletionForm from archaeological_operations.forms import ArchaeologicalSiteForm, \ OperationFormSelection, OperationFormFileChoice, OperationFormGeneral, \ OperationFormModifGeneral, FinalOperationClosingForm, \ @@ -39,26 +34,24 @@ from archaeological_operations.forms import ArchaeologicalSiteForm, \ OperationFormPreventiveDiag, TownFormset, SelectedTownFormset, \ SelectedParcelGeneralFormSet, SelectedParcelFormSet, RemainForm, \ PeriodForm, RecordRelationsFormSet, OperationFormAbstract, \ - OperationDeletionForm, SiteFormSelection, OperationSourceFormSelection, \ - SourceOperationFormSelection, OperationSourceForm, \ + OperationDeletionForm, SiteFormSelection, \ AdministrativeActOpeFormSelection, AdministrativeActOpeForm, \ AdministrativeActOpeModifForm, FinalAdministrativeActDeleteForm, \ AdministrativeActRegisterFormSelection, DocumentGenerationAdminActForm, \ SiteForm, SiteTownFormset, SiteUnderwaterForm, check_underwater_module, \ - CourtOrderedSeizureForm, ImagesFormset, SiteImagesFormset - -from ishtar_common.views import get_item, show_item, revert_item, new_item - -from ishtar_common.wizards import SearchWizard, check_rights_condition + CourtOrderedSeizureForm from archaeological_operations.wizards import has_associated_file, \ is_preventive, is_judiciary, OperationWizard, OperationModificationWizard, \ OperationClosingWizard, OperationDeletionWizard, SiteSearch, \ - OperationSourceWizard, OperationSourceDeletionWizard, \ OperationAdministrativeActWizard, OperationEditAdministrativeActWizard, \ AdministrativeActDeletionWizard, SiteWizard, SiteModificationWizard, \ SiteDeletionWizard - +from ishtar_common.forms import ClosingDateFormSelection, FinalForm, \ + FinalDeleteForm +from ishtar_common.models import get_current_profile, IshtarSiteProfile from ishtar_common.utils import put_session_message +from ishtar_common.views import get_item, show_item, revert_item, new_item +from ishtar_common.wizards import SearchWizard, check_rights_condition def autocomplete_patriarche(request): @@ -164,10 +157,6 @@ get_operation = get_item(models.Operation, 'get_operation', 'operation') show_operation = show_item(models.Operation, 'operation') revert_operation = revert_item(models.Operation) -show_operationsource = show_item(models.OperationSource, 'operationsource') -get_operationsource = get_item(models.OperationSource, 'get_operationsource', - 'operationsource') - get_administrativeactop = get_item( models.AdministrativeAct, 'get_administrativeactop', 'administrativeactop') @@ -197,7 +186,6 @@ wizard_steps = [ ('general-operation_creation', OperationFormGeneral), ('judiciary-operation_creation', CourtOrderedSeizureForm), ('collaborators-operation_creation', CollaboratorForm), - ('images-operation_creation', ImagesFormset), ('archaeologicalsite-operation_creation', ArchaeologicalSiteFormSet), ('preventive-operation_creation', OperationFormPreventive), ('preventivediag-operation_creation', OperationFormPreventiveDiag), @@ -260,7 +248,6 @@ operation_modif_wizard_steps = [ ('general-operation_modification', OperationFormModifGeneral), ('judiciary-operation_modification', CourtOrderedSeizureForm), ('collaborators-operation_modification', CollaboratorForm), - ('images-operation_modification', ImagesFormset), ('archaeologicalsite-operation_modification', ArchaeologicalSiteFormSet), ('preventive-operation_modification', OperationFormPreventive), ('preventivediag-operation_modification', OperationFormPreventiveDiag), @@ -373,7 +360,6 @@ site_search_wizard = SiteSearch.as_view( site_creation_steps = [ ('general-site_creation', SiteForm), ('towns-site_creation', SiteTownFormset), - ('images-site_creation', SiteImagesFormset), ('underwater-site_creation', SiteUnderwaterForm), ('final-site_creation', FinalForm) ] @@ -388,7 +374,6 @@ site_modification_steps = [ ('selec-site_modification', SiteFormSelection), ('general-site_modification', SiteForm), ('towns-site_modification', SiteTownFormset), - ('images-site_modification', SiteImagesFormset), ('underwater-site_modification', SiteUnderwaterForm), ('final-site_modification', FinalForm) ] @@ -418,48 +403,6 @@ site_deletion_wizard = SiteDeletionWizard.as_view( label=_(u"Site deletion"), url_name='site_deletion',) -# operation sources - -operation_source_search_wizard = SearchWizard.as_view([ - ('selec-operation_source_search', OperationSourceFormSelection)], - label=_(u"Operation: source search"), - url_name='operation_source_search',) - -operation_source_creation_wizard = OperationSourceWizard.as_view([ - ('selec-operation_source_creation', SourceOperationFormSelection), - ('source-operation_source_creation', OperationSourceForm), - ('authors-operation_source_creation', AuthorFormset), - ('final-operation_source_creation', FinalForm)], - label=_(u"Operation: source creation"), - url_name='operation_source_creation',) - -operation_source_modification_steps = [ - ('selec-operation_source_modification', OperationSourceFormSelection), - ('source-operation_source_modification', OperationSourceForm), - ('authors-operation_source_modification', AuthorFormset), - ('final-operation_source_modification', FinalForm) -] - -operation_source_modification_wizard = OperationSourceWizard.as_view( - operation_source_modification_steps, - label=_(u"Operation: source modification"), - url_name='operation_source_modification',) - - -def operation_source_modify(request, pk): - operation_source_modification_wizard(request) - OperationSourceWizard.session_set_value( - request, 'selec-operation_source_modification', 'pk', pk, reset=True) - return redirect(reverse( - 'operation_source_modification', - kwargs={'step': 'source-operation_source_modification'})) - -operation_source_deletion_wizard = OperationSourceDeletionWizard.as_view([ - ('selec-operation_source_deletion', OperationSourceFormSelection), - ('final-operation_source_deletion', SourceDeletionForm)], - label=_(u"Operation: source deletion"), - url_name='operation_source_deletion',) - operation_administrativeactop_search_wizard = SearchWizard.as_view([ ('general-operation_administrativeactop_search', AdministrativeActOpeFormSelection)], -- cgit v1.2.3