From f1dc9dbfed7cc90899f9975c29091a61e63fcb02 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 12 Nov 2018 16:18:57 +0100 Subject: Fix pin and unpi for administrativ acts --- archaeological_context_records/views.py | 54 ++++++++++++++++----------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'archaeological_context_records/views.py') diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py index 6966c81e6..771a2ed71 100644 --- a/archaeological_context_records/views.py +++ b/archaeological_context_records/views.py @@ -26,14 +26,14 @@ from django.shortcuts import redirect from django.utils.translation import ugettext_lazy as _ from django.views.generic import RedirectView -import models +from archaeological_context_records import models from archaeological_operations.views import site_extra_context -from forms import * +from archaeological_context_records import forms from ishtar_common.utils import put_session_message from ishtar_common.views import IshtarMixin, LoginRequiredMixin from ishtar_common.views_item import display_item, get_item, show_item, \ revert_item -from wizards import * +from archaeological_context_records import wizards show_contextrecord = show_item( models.ContextRecord, 'contextrecord', @@ -90,37 +90,37 @@ get_contextrecordrelationdetail = get_item( models.RecordRelations, 'get_contextrecordrelationdetail', 'contextrecordrelationdetail', specific_perms=['view_recordrelation']) -record_search_wizard = RecordSearch.as_view([ - ('general-record_search', RecordFormSelection)], +record_search_wizard = wizards.RecordSearch.as_view([ + ('general-record_search', forms.RecordFormSelection)], label=_(u"Context record search"), url_name='record_search',) record_creation_steps = [ - ('selec-record_creation', OperationRecordFormSelection), - ('general-record_creation', RecordFormGeneral), - ('datings-record_creation', DatingFormSet), - ('interpretation-record_creation', RecordFormInterpretation), - ('relations-record_creation', RecordRelationsFormSet), - ('final-record_creation', FinalForm) + ('selec-record_creation', forms.OperationRecordFormSelection), + ('general-record_creation', forms.RecordFormGeneral), + ('datings-record_creation', forms.DatingFormSet), + ('interpretation-record_creation', forms.RecordFormInterpretation), + ('relations-record_creation', forms.RecordRelationsFormSet), + ('final-record_creation', forms.FinalForm) ] -record_creation_wizard = RecordWizard.as_view( +record_creation_wizard = wizards.RecordWizard.as_view( record_creation_steps, label=_(u"New context record"), url_name='record_creation', ) record_modification_steps = [ - ('selec-record_modification', RecordFormSelection), - ('operation-record_modification', OperationFormSelection), - ('general-record_modification', RecordFormGeneral), - ('datings-record_modification', DatingFormSet), - ('interpretation-record_modification', RecordFormInterpretation), - ('relations-record_modification', RecordRelationsFormSet), - ('final-record_modification', FinalForm) + ('selec-record_modification', forms.RecordFormSelection), + ('operation-record_modification', forms.OperationFormSelection), + ('general-record_modification', forms.RecordFormGeneral), + ('datings-record_modification', forms.DatingFormSet), + ('interpretation-record_modification', forms.RecordFormInterpretation), + ('relations-record_modification', forms.RecordRelationsFormSet), + ('final-record_modification', forms.FinalForm) ] -record_modification_wizard = RecordModifWizard.as_view( +record_modification_wizard = wizards.RecordModifWizard.as_view( record_modification_steps, label=_(u"Context record modification"), url_name='record_modification', @@ -138,23 +138,23 @@ def record_modify(request, pk): ) return HttpResponseRedirect("/") - RecordModifWizard.session_set_value( + wizards.RecordModifWizard.session_set_value( request, 'selec-record_modification', 'pk', pk, reset=True) return redirect(reverse('record_modification', kwargs={'step': 'operation-record_modification'})) -record_deletion_wizard = RecordDeletionWizard.as_view([ - ('selec-record_deletion', RecordFormSelection), - ('final-record_deletion', RecordDeletionForm)], +record_deletion_wizard = wizards.RecordDeletionWizard.as_view([ + ('selec-record_deletion', forms.RecordFormSelection), + ('final-record_deletion', forms.RecordDeletionForm)], label=_(u"Context record deletion"), url_name='record_deletion',) def reset_wizards(request): for wizard_class, url_name in ( - (RecordWizard, 'record_creation'), - (RecordModifWizard, 'record_modification'), - (RecordDeletionWizard, 'record_deletion')): + (wizards.RecordWizard, 'record_creation'), + (wizards.RecordModifWizard, 'record_modification'), + (wizards.RecordDeletionWizard, 'record_deletion')): wizard_class.session_reset(request, url_name) -- cgit v1.2.3