From 6d11d2cd901e043dae90d5bcc13deef454f96dce Mon Sep 17 00:00:00 2001 From: Cefin Date: Mon, 13 Dec 2021 16:35:38 +0000 Subject: clean the code for #5231 --- archaeological_finds/models_finds.py | 2 +- archaeological_finds/urls.py | 13 +++---------- archaeological_finds/views.py | 4 ++-- 3 files changed, 6 insertions(+), 13 deletions(-) (limited to 'archaeological_finds') diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 7486de076..94c3b97b4 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1707,7 +1707,7 @@ class Find( module="warehouse", ), QuickAction( - url="treatment_creation_n1", + url="treatment-n1-create", icon_class="fa fa-object-group", text=_("Treatment many to one"), target="many", diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py index 5cdb9c045..1f76b0b34 100644 --- a/archaeological_finds/urls.py +++ b/archaeological_finds/urls.py @@ -232,13 +232,6 @@ urlpatterns = [ name="find-qa-lock", kwargs={"model": models.Find}, ), - url( - r"^find-qa-treatmentN1/(?P[0-9-]+)?/$", - check_rights(["change_find", "change_own_find"])( - views.QAFindTreatmentN1View.as_view() - ), - name="find-qa-treatmentN1", - ), url( r"^treatment_creation/(?P.+)?$", check_rights(["change_find", "change_own_find"])( @@ -254,9 +247,9 @@ urlpatterns = [ name="treatment_creation_n1", ), url( - r"treatmentN1_create/(?P\d+)$", - views.treatmentN1_create, - name="treatmentN1-create", + r"treatment_n1_create/(?P\d+)$", + views.treatment_n1_create, + name="treatment-n1-create", ), url( r"^treatment_creation_1n/(?P.+)?$", diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 4d8430359..f81c6d27a 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -655,8 +655,8 @@ treatment_creation_n1_wizard = wizards.TreatmentN1Wizard.as_view( ) -def treatmentN1_create(request, pk): - if not wizard_is_available(treatment_creation_n1_wizard, models.Treatment): +def treatment_n1_create(request, pk): + if not wizard_is_available(treatment_creation_n1_wizard, models.Find, pk): return HttpResponseRedirect("/") wizards.TreatmentWizard.session_set_value( request, "selecfind-treatment_creation_n1", "pk", pk, reset=True -- cgit v1.2.3