diff options
Diffstat (limited to 'archaeological_operations/urls.py')
| -rw-r--r-- | archaeological_operations/urls.py | 139 | 
1 files changed, 69 insertions, 70 deletions
diff --git a/archaeological_operations/urls.py b/archaeological_operations/urls.py index 46461a2bd..65e2e6bda 100644 --- a/archaeological_operations/urls.py +++ b/archaeological_operations/urls.py @@ -17,8 +17,7 @@  # See the file COPYING for details. -from django.conf.urls import url -from django.urls import path, register_converter +from django.urls import path, re_path, register_converter  from ishtar_common import urls_converters  from ishtar_common.views import QALinkView @@ -34,7 +33,7 @@ register_converter(urls_converters.UnderscoreSlug, "uslug")  # forms  urlpatterns = [ -    url( +    re_path(          r"operation_administrativeactop_search/(?P<step>.+)?$",          check_permissions([              "archaeological_operations.view_administrativeact", @@ -43,14 +42,14 @@ urlpatterns = [          ),          name="operation_administrativeactop_search",      ), -    url( +    re_path(          r"operation_administrativeactop/(?P<step>.+)?$",          check_permissions(["archaeological_operations.add_administrativeact"])(              views.operation_administrativeactop_wizard          ),          name="operation_administrativeactop",      ), -    url( +    re_path(          r"operation_administrativeactop_modification/(?P<step>.+)?$",          check_permissions([              "archaeological_operations.change_administrativeact", @@ -59,12 +58,12 @@ urlpatterns = [          ),          name="operation_administrativeactop_modification",      ), -    url( +    re_path(          r"operation_administrativeactop_modify/(?P<pk>.+)/$",          views.operation_administrativeactop_modify,          name="operation_administrativeactop_modify",      ), -    url( +    re_path(          r"operation_administrativeactop_deletion/(?P<step>.+)?$",          check_permissions([              "archaeological_operations.delete_administrativeact", @@ -73,12 +72,12 @@ urlpatterns = [          ),          name="operation_administrativeactop_deletion",      ), -    url( +    re_path(          r"operation_administrativeactop_delete/(?P<pk>.+)/$",          views.operation_administrativeactop_delete,          name="delete-administrativeact-operation",      ), -    url( +    re_path(          r"operation_search/(?P<step>.+)?$",          check_permissions(              ["archaeological_operations.view_operation", @@ -86,22 +85,22 @@ urlpatterns = [          )(views.operation_search_wizard),          name="operation_search",      ), -    url( +    re_path(          r"^operation-add-adminact/(?P<pk>[0-9-]+)/$",          check_permissions(              ["archaeological_operations.add_administrativeact"]          )(views.operation_adminact_add),          name="operation-add-adminact",      ), -    url( +    re_path(          r"operation_creation/(?P<step>.+)?$",          check_permissions(              ["archaeological_operations.add_operation"]          )(views.operation_creation_wizard),          name="operation_creation",      ), -    url(r"operation_add/(?P<file_id>\d+)$", views.operation_add, name="operation_add"), -    url( +    re_path(r"operation_add/(?P<file_id>\d+)$", views.operation_add, name="operation_add"), +    re_path(          r"operation_modification/(?P<step>.+)?$",          check_permissions(              ["archaeological_operations.change_operation", @@ -109,12 +108,12 @@ urlpatterns = [          )(views.operation_modification_wizard),          name="operation_modification",      ), -    url( +    re_path(          r"operation_modify/(?P<pk>.+)/$",          views.operation_modify,          name="operation_modify",      ), -    url( +    re_path(          r"operation_closing/(?P<step>.+)?$",          check_permissions(              ["archaeological_operations.change_operation", @@ -122,7 +121,7 @@ urlpatterns = [          )(views.operation_closing_wizard),          name="operation_closing",      ), -    url( +    re_path(          r"operation_deletion/(?P<step>.+)?$",          check_permissions(              ["archaeological_operations.change_operation", @@ -130,12 +129,12 @@ urlpatterns = [          )(views.operation_deletion_wizard),          name="operation_deletion",      ), -    url( +    re_path(          r"operation_delete/(?P<pk>.+)/$",          views.operation_delete,          name="delete-operation",      ), -    url( +    re_path(          r"administrativact_register/(?P<step>.+)?$",          check_permissions(              ["archaeological_operations.view_administrativeact", @@ -143,145 +142,145 @@ urlpatterns = [          )(views.administrativact_register_wizard),          name="administrativact_register",      ), -    url( +    re_path(          r"autocomplete-operation/$",          views.autocomplete_operation,          name="autocomplete-operation",      ), -    url( +    re_path(          r"get-operation/own/(?P<type>.+)?$",          views.get_operation,          name="get-own-operation",          kwargs={"force_own": True},      ), -    url(r"get-operation/(?P<type>.+)?$", views.get_operation, name="get-operation"), -    url( +    re_path(r"get-operation/(?P<type>.+)?$", views.get_operation, name="get-operation"), +    re_path(          r"get-operation-full/own/(?P<type>.+)?$",          views.get_operation,          name="get-own-operation-full",          kwargs={"full": True, "force_own": True},      ), -    url( +    re_path(          r"get-operation-full/(?P<type>.+)?$",          views.get_operation,          name="get-operation-full",          kwargs={"full": True},      ), -    url( +    re_path(          r"get-operation-shortcut/(?P<type>.+)?$",          views.get_operation,          name="get-operation-shortcut",          kwargs={"full": "shortcut"},      ), -    url( +    re_path(          r"get-available-operation-code/(?P<year>.+)?$",          views.get_available_operation_code,          name="get_available_operation_code",      ), -    url( +    re_path(          r"revert-operation/(?P<pk>.+)/(?P<date>.+)$",          views.revert_operation,          name="revert-operation",      ), -    url( +    re_path(          r"show-operation(?:/(?P<pk>.+))?/(?P<type>.+)?$",          views.show_operation,          name=models.Operation.SHOW_URL,      ), -    url( +    re_path(          r"show-historized-operation/(?P<pk>.+)?/(?P<date>.+)?$",          views.show_operation,          name="show-historized-operation",      ), -    url( +    re_path(          r"get-administrativeactop/(?P<type>.+)?$",          views.get_administrativeactop,          name="get-administrativeactop",      ), -    url( +    re_path(          r"get-administrativeact/(?P<type>.+)?$",          views.get_administrativeact,          name="get-administrativeact",      ), -    url( +    re_path(          r"get-administrativeact-full/(?P<type>.+)?$",          views.get_administrativeact,          name="get-administrativeact-full",          kwargs={"full": True},      ), -    url( +    re_path(          r"show-administrativeact(?:/(?P<pk>.+))?/(?P<type>.+)?$",          views.show_administrativeact,          name="show-administrativeact",      ),      # allow specialization for operations -    url( +    re_path(          r"show-administrativeact(?:/(?P<pk>.+))?/(?P<type>.+)?$",          views.show_administrativeact,          name="show-administrativeactop",      ),      # allow specialization for files, treatment, treatment request -    url( +    re_path(          r"show-administrativeact(?:/(?P<pk>.+))?/(?P<type>.+)?$",          views.show_administrativeact,          name="show-administrativeactfile",      ), -    url( +    re_path(          r"show-administrativeact(?:/(?P<pk>.+))?/(?P<type>.+)?$",          views.show_administrativeact,          name="show-administrativeacttreatment",      ), -    url( +    re_path(          r"show-administrativeact(?:/(?P<pk>.+))?/(?P<type>.+)?$",          views.show_administrativeact,          name="show-administrativeacttreatmentfile",      ), -    url( +    re_path(          r"generatedoc-administrativeactop/(?P<pk>.+)?/(?P<template_pk>.+)?$",          views.generatedoc_administrativeactop,          name="generatedoc-administrativeactop",      ), -    url( +    re_path(          r"autocomplete-administrativeact/$",          views.autocomplete_administrativeact,          name="autocomplete-administrativeact",      ), -    url( +    re_path(          r"autocomplete-archaeologicalsite/$",          views.autocomplete_archaeologicalsite,          name="autocomplete-archaeologicalsite",      ), -    url( +    re_path(          r"new-archaeologicalsite/(?:(?P<parent_name>[^/]+)/)?"          r"(?:(?P<limits>[^/]+)/)?$",          views.new_archaeologicalsite,          name="new-archaeologicalsite",      ), -    url(r"get-site/(?P<type>.+)?$", views.get_site, name="get-site"), -    url( +    re_path(r"get-site/(?P<type>.+)?$", views.get_site, name="get-site"), +    re_path(          r"get-site-full/(?P<type>.+)?$",          views.get_site,          name="get-site-full",          kwargs={"full": True},      ), -    url( +    re_path(          r"get-site-shortcut/(?P<type>.+)?$",          views.get_site,          name="get-site-shortcut",          kwargs={"full": "shortcut"},      ), -    url(r"revert-site/(?P<pk>.+)/(?P<date>.+)$", views.revert_site, name="revert-site"), -    url( +    re_path(r"revert-site/(?P<pk>.+)/(?P<date>.+)$", views.revert_site, name="revert-site"), +    re_path(          r"show-site(?:/(?P<pk>.+))?/(?P<type>.+)?$",          views.show_site,          name=models.ArchaeologicalSite.SHOW_URL,      ), -    url( +    re_path(          r"show-historized-site/(?P<pk>.+)?/(?P<date>.+)?$",          views.show_site,          name="show-historized-site",      ), -    url( +    re_path(          r"site_search/(?P<step>.+)?$",          check_permissions(              ["archaeological_operations.view_archaeologicalsite", @@ -289,14 +288,14 @@ urlpatterns = [          )(views.site_search_wizard),          name="site_search",      ), -    url( +    re_path(          r"site_creation/(?P<step>.+)?$",          check_permissions(              ["archaeological_operations.add_archaeologicalsite"]          )(views.site_creation_wizard),          name="site_creation",      ), -    url( +    re_path(          r"site_modification/(?P<step>.+)?$",          check_permissions(              ["archaeological_operations.change_archaeologicalsite", @@ -304,31 +303,31 @@ urlpatterns = [          )(views.site_modification_wizard),          name="site_modification",      ), -    url(r"site_modify/(?P<pk>.+)/$", views.site_modify, name="site_modify"), -    url( +    re_path(r"site_modify/(?P<pk>.+)/$", views.site_modify, name="site_modify"), +    re_path(          r"site_deletion/(?P<step>.+)?$",          check_permissions(              ["archaeological_operations.change_archaeologicalsite"]          )(views.site_deletion_wizard),          name="site_deletion",      ), -    url(r"site_delete/(?P<pk>.+)/$", views.site_delete, name="delete-site"), -    url( +    re_path(r"site_delete/(?P<pk>.+)/$", views.site_delete, name="delete-site"), +    re_path(          r"autocomplete-patriarche/$",          views.autocomplete_patriarche,          name="autocomplete-patriarche",      ), -    url( +    re_path(          r"operation_administrativeact_document/$",          views.administrativeactfile_document,          name="operation-administrativeact-document",      ), -    url( +    re_path(          r"^operation-parcels-modify/(?P<pk>.+)/$",          views.operation_modify_parcels,          name="operation-parcels-modify",      ), -    url( +    re_path(          r"^operation-relations-modify/(?P<pk>.+)/$",          check_permissions(              ["archaeological_operations.change_operation", @@ -368,7 +367,7 @@ urlpatterns = [          )(views.site_operation_modify_relations),          name="site-operation-relations-modify",      ), -    url( +    re_path(          r"^operation-qa-bulk-update/(?P<pks>[0-9-]+)?/$",          check_permissions(              ["archaeological_operations.change_operation", @@ -376,7 +375,7 @@ urlpatterns = [          )(views.QAOperationForm.as_view()),          name="operation-qa-bulk-update",      ), -    url( +    re_path(          r"^operation-qa-bulk-update/(?P<pks>[0-9-]+)?/confirm/$",          check_permissions(              ["archaeological_operations.change_operation", @@ -385,7 +384,7 @@ urlpatterns = [          name="operation-qa-bulk-update-confirm",          kwargs={"confirm": True},      ), -    url( +    re_path(          r"^operation-qa-duplicate/(?P<pks>[0-9-]+)?/$",          check_permissions(              ["archaeological_operations.change_operation", @@ -393,19 +392,19 @@ urlpatterns = [          )(views.QAOperationdDuplicateFormView.as_view()),          name="operation-qa-duplicate",      ), -    url( +    re_path(          r"^operation-qa-lock/(?P<pks>[0-9-]+)?/$",          views.QAOperationLockView.as_view(),          name="operation-qa-lock",          kwargs={"model": models.Operation},      ), -    url( +    re_path(          r"^operation-qa-link/(?P<pks>[0-9-]+)?/$",          QALinkView.as_view(),          name="operation-qa-link",          kwargs={"model": models.Operation, "url": "operation-qa-link"},      ), -    url( +    re_path(          r"^site-qa-duplicate/(?P<pks>[0-9-]+)?/$",          check_permissions(              ["archaeological_operations.change_archaeologicalsite", @@ -413,19 +412,19 @@ urlpatterns = [          )(views.QAArchaeologicalSiteDuplicateFormView.as_view()),          name="site-qa-duplicate",      ), -    url( +    re_path(          r"^site-qa-lock/(?P<pks>[0-9-]+)?/$",          views.QASiteLockView.as_view(),          name="site-qa-lock",          kwargs={"model": models.ArchaeologicalSite},      ), -    url( +    re_path(          r"^site-qa-link/(?P<pks>[0-9-]+)?/$",          QALinkView.as_view(),          name="site-qa-link",          kwargs={"model": models.ArchaeologicalSite, "url": "site-qa-link"},      ), -    url( +    re_path(          r"^site-qa-bulk-update/(?P<pks>[0-9-]+)?/$",          check_permissions(              ["archaeological_operations.change_archaeologicalsite", @@ -433,7 +432,7 @@ urlpatterns = [          )(views.QAArchaeologicalSiteForm.as_view()),          name="site-qa-bulk-update",      ), -    url( +    re_path(          r"^site-qa-bulk-update/(?P<pks>[0-9-]+)?/confirm/$",          check_permissions(              ["archaeological_operations.change_archaeologicalsite", @@ -442,20 +441,20 @@ urlpatterns = [          name="site-qa-bulk-update-confirm",          kwargs={"confirm": True},      ), -    url( +    re_path(          r"generate-stats-operation/(?P<pk>.+)/",          views.GenerateStatsOperation.as_view(),          name="generate-stats-operation",      ), -    url( +    re_path(          r"api/facets/operation/$", views_api.FacetOperationAPIView.as_view(),          name="api-facets-operation"      ), -    url( +    re_path(          r"api/search/operation/$", views_api.SearchOperationAPI.as_view(),          name="api-search-operation"      ), -    url( +    re_path(          r"api/search/archaeologicalsite/$", views_api.SearchSiteAPI.as_view(),          name="api-search-archaeologicalsite"      ),  | 
