From bbde20e66cf624a7919050548cbfa8248173c49f Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 13 Sep 2019 16:52:49 +0200 Subject: Delete action: operations, sites, orgas, containers, warehouses --- ishtar_common/views.py | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'ishtar_common/views.py') diff --git a/ishtar_common/views.py b/ishtar_common/views.py index abd2b79d8..0f0854720 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -154,7 +154,9 @@ person_modification_wizard = wizards.PersonModifWizard.as_view( def person_modify(request, pk): - person_modification_wizard(request) + if not wizard_is_available(person_modification_wizard, request, + models.Person, pk): + return HttpResponseRedirect("/") wizards.PersonModifWizard.session_set_value( request, 'selec-person_modification', 'pk', pk, reset=True) return redirect(reverse('person_modification', @@ -169,7 +171,9 @@ person_deletion_wizard = wizards.PersonDeletionWizard.as_view( def person_delete(request, pk): - person_deletion_wizard(request) + if not wizard_is_available(person_deletion_wizard, request, + models.Person, pk): + return HttpResponseRedirect("/") wizards.PersonDeletionWizard.session_set_value( request, 'selec-person_deletion', 'pk', pk, reset=True) return redirect(reverse('person_deletion', @@ -195,7 +199,9 @@ organization_modification_wizard = wizards.OrganizationModifWizard.as_view( def organization_modify(request, pk): - organization_modification_wizard(request) + if not wizard_is_available(organization_modification_wizard, request, + models.Organization, pk): + return HttpResponseRedirect("/") wizards.OrganizationModifWizard.session_set_value( request, 'selec-organization_modification', 'pk', pk, reset=True) return redirect( @@ -209,6 +215,18 @@ organization_deletion_wizard = wizards.OrganizationDeletionWizard.as_view( label=_(u"Organization deletion"), url_name='organization_deletion',) + +def organization_delete(request, pk): + if not wizard_is_available(organization_deletion_wizard, request, + models.Organization, pk): + return HttpResponseRedirect("/") + wizard_url = 'organization_deletion' + wizards.OrganizationDeletionWizard.session_set_value( + request, 'selec-' + wizard_url, 'pk', pk, reset=True) + return redirect( + reverse(wizard_url, + kwargs={'step': 'final-' + wizard_url})) + account_wizard_steps = [ ('selec-account_management', forms.PersonUserFormSelection), ('account-account_management', forms.AccountForm), -- cgit v1.2.3