diff options
Diffstat (limited to 'ishtar_common/urls.py')
| -rw-r--r-- | ishtar_common/urls.py | 280 |
1 files changed, 140 insertions, 140 deletions
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py index d2c954e58..1014b639c 100644 --- a/ishtar_common/urls.py +++ b/ishtar_common/urls.py @@ -18,9 +18,9 @@ # See the file COPYING for details. from django.conf import settings -from django.conf.urls import include, url +from django.conf.urls import include from django.conf.urls.static import static -from django.urls import path +from django.urls import path, re_path from django.views.generic import TemplateView from .menus import Menu @@ -32,89 +32,89 @@ from ishtar_common.utils import check_permissions, get_urls_for_model # forms urlpatterns = [ - url(r"^status/$", views.status, name="status"), - url(r"^raise-error/$", views.raise_error, name="raise-error"), - url(r"^raise-task-error/$", views.raise_task_error, name="raise-task-error"), - url(r"^ty/(?P<url_id>[a-zA-Z0-9]+)$", views.tiny_redirect, name="tiny-redirect"), - url( + re_path(r"^status/$", views.status, name="status"), + re_path(r"^raise-error/$", views.raise_error, name="raise-error"), + re_path(r"^raise-task-error/$", views.raise_task_error, name="raise-task-error"), + re_path(r"^ty/(?P<url_id>[a-zA-Z0-9]+)$", views.tiny_redirect, name="tiny-redirect"), + re_path( r"^robots\.txt$", TemplateView.as_view(template_name="robots.txt", content_type="text/plain"), ), # internationalization - url(r"^i18n/", include("django.conf.urls.i18n")), - url(r"^js/settings.js", views.settings_js, name="settings-js"), + re_path(r"^i18n/", include("django.conf.urls.i18n")), + re_path(r"^js/settings.js", views.settings_js, name="settings-js"), # General - url(r"shortcut_menu/", views.shortcut_menu, name="shortcut-menu"), - url(r"news-feed/", views.display_news_feed, name="news-feed"), - url( + re_path(r"shortcut_menu/", views.shortcut_menu, name="shortcut-menu"), + re_path(r"news-feed/", views.display_news_feed, name="news-feed"), + re_path( r"display/(?P<item_type>\w+)/(?P<pk>\d+)/", views.DisplayItemView.as_view(), name="display-item", ), - url(r"qrcode/search/", views.QRCodeForSearchView.as_view(), name="search-qrcode"), - url( + re_path(r"qrcode/search/", views.QRCodeForSearchView.as_view(), name="search-qrcode"), + re_path( r"qrcode/(?P<app>[-a-z]+)/(?P<model_name>[-a-z]+)/(?P<pk>\d+)/", views.QRCodeView.as_view(), name="qrcode-item", ), - url( + re_path( r"^generate-labels/(?P<template_slug>[-a-z0-9]+)/", views.GenerateLabelView.as_view(), name="generate-labels", ), - url( + re_path( r"^generate-document/(?P<template_slug>[-a-z0-9]+)/(" r"?P<item_pk>\d+)/", views.GenerateView.as_view(), name="generate-document", ), - url( + re_path( r"person_search/(?P<step>.+)?$", check_permissions( ["ishtar_common.view_person", "ishtar_common.view_own_person"] )(views.person_search_wizard), name="person_search", ), - url( + re_path( r"person_creation/(?P<step>.+)?$", check_permissions(["ishtar_common.add_person"])(views.person_creation_wizard), name="person_creation", ), - url( + re_path( r"person_modification/(?P<step>.+)?$", check_permissions( ["ishtar_common.change_person", "ishtar_common.change_own_person"] )(views.person_modification_wizard), name="person_modification", ), - url(r"person_modify/(?P<pk>.+)/$", views.person_modify, name="person_modify"), - url( + re_path(r"person_modify/(?P<pk>.+)/$", views.person_modify, name="person_modify"), + re_path( r"person_deletion/(?P<step>.+)?$", check_permissions( ["ishtar_common.delete_person", "ishtar_common.delete_own_person"] )(views.person_deletion_wizard), name="person_deletion", ), - url(r"person_delete/(?P<pk>.+)/$", views.person_delete, name="person_delete"), - url( + re_path(r"person_delete/(?P<pk>.+)/$", views.person_delete, name="person_delete"), + re_path( r"^person-edit/$", check_permissions(["ishtar_common.add_person"])(views.PersonCreate.as_view()), name="person_create", ), - url( + re_path( r"^person-edit/(?P<pk>\d+)$", check_permissions( ["ishtar_common.change_person", "ishtar_common.change_own_person"] )(views.PersonEdit.as_view()), name="person_edit", ), - url( + re_path( r"^person-qa-bulk-update/(?P<pks>[0-9-]+)?/$", check_permissions( ["ishtar_common.change_person", "ishtar_common.change_own_person"] )(views.QAPersonForm.as_view()), name="person-qa-bulk-update", ), - url( + re_path( r"^person-qa-bulk-update/(?P<pks>[0-9-]+)?/confirm/$", check_permissions( ["ishtar_common.change_person", "ishtar_common.change_own_person"] @@ -122,52 +122,52 @@ urlpatterns = [ name="person-qa-bulk-update-confirm", kwargs={"confirm": True}, ), - url( + re_path( r"organization_search/(?P<step>.+)?$", check_permissions( ["ishtar_common.view_organization", "ishtar_common.view_own_organization"] )(views.organization_search_wizard), name="organization_search", ), - url( + re_path( r"organization_creation/(?P<step>.+)?$", check_permissions( ["ishtar_common.add_organization"] )(views.organization_creation_wizard), name="organization_creation", ), - url( + re_path( r"organization_modification/(?P<step>.+)?$", check_permissions( ["ishtar_common.change_organization", "ishtar_common.change_own_organization"] )(views.organization_modification_wizard), name="organization_modification", ), - url( + re_path( r"organization_modify/(?P<pk>.+)/$", views.organization_modify, name="organization_modify", ), - url( + re_path( r"organization_deletion/(?P<step>.+)?$", check_permissions( ["ishtar_common.delete_organization", "ishtar_common.delete_own_organization"] )(views.organization_deletion_wizard), name="organization_deletion", ), - url( + re_path( r"organization_delete/(?P<pk>.+)/$", views.organization_delete, name="delete-organization", ), - url( + re_path( r"organization-edit/$", check_permissions( ["ishtar_common.add_organization"] )(views.OrganizationCreate.as_view()), name="organization_create", ), - url( + re_path( r"organization-edit/(?P<pk>\d+)$", check_permissions( ["ishtar_common.change_organization", @@ -175,28 +175,28 @@ urlpatterns = [ )(views.OrganizationEdit.as_view()), name="organization_edit", ), - url( + re_path( r"organization-person-edit/$", check_permissions( ["ishtar_common.add_organization"] )(views.OrganizationPersonCreate.as_view()), name="organization_person_create", ), - url( + re_path( r"organization-person-edit/(?P<pk>\d+)$", check_permissions( ["ishtar_common.change_organization", "ishtar_common.change_own_organization"] )(views.OrganizationPersonEdit.as_view()), name="organization_person_edit", ), - url( + re_path( r"^organization-qa-bulk-update/(?P<pks>[0-9-]+)?/$", check_permissions( ["ishtar_common.change_organization", "ishtar_common.change_own_organization"] )(views.QAOrganizationForm.as_view()), name="organization-qa-bulk-update", ), - url( + re_path( r"^organization-qa-bulk-update/(?P<pks>[0-9-]+)?/confirm/$", check_permissions( ["ishtar_common.change_organization", "ishtar_common.change_own_organization"] @@ -204,55 +204,55 @@ urlpatterns = [ name="organization-qa-bulk-update-confirm", kwargs={"confirm": True}, ), - url(r"get-ishtaruser/(?P<type>.+)?$", views.get_ishtaruser, name="get-ishtaruser"), - url( + re_path(r"get-ishtaruser/(?P<type>.+)?$", views.get_ishtaruser, name="get-ishtaruser"), + re_path( r"account_management/(?P<step>.+)?$", check_permissions( ["ishtar_common.add_ishtaruser"] )(views.account_management_wizard), name="account_management", ), - url( + re_path( r"account_manage/(?P<pk>\d+)$", views.account_manage, name="account-manage", ), - url( + re_path( r"account_deletion/(?P<step>.+)?$", check_permissions( ["ishtar_common.add_ishtaruser"] )(views.account_deletion_wizard), name="account_deletion", ), - url( + re_path( r"^import-new/$", check_permissions( ["ishtar_common.add_import", "ishtar_common.add_own_import"] )(views.NewImportView.as_view()), name="new_import", ), - url( + re_path( r"^import-edit/(?P<pk>[0-9]+)/$", check_permissions( ["ishtar_common.change_import", "ishtar_common.change_own_import"] )(views.EditImportView.as_view()), name="edit_import", ), - url( + re_path( r"^import-new-gis/$", check_permissions( ["ishtar_common.add_import", "ishtar_common.add_own_import"] )(views.NewImportGISView.as_view()), name="new_import_gis", ), - url( + re_path( r"^import-new-group/$", check_permissions( ["ishtar_common.add_import", "ishtar_common.add_own_import"] )(views.NewImportGroupView.as_view()), name="new_import_group", ), - url( + re_path( r"^import-list/$", check_permissions( ["ishtar_common.view_import", "ishtar_common.change_import", @@ -260,7 +260,7 @@ urlpatterns = [ )(views.ImportListView.as_view()), name="current_imports", ), - url( + re_path( r"^import-list-table/$", check_permissions( ["ishtar_common.view_import", "ishtar_common.change_import", @@ -268,7 +268,7 @@ urlpatterns = [ )(views.ImportListTableView.as_view()), name="current_imports_table", ), - url( + re_path( r"^import-get-status/$", check_permissions( ["ishtar_common.view_import", "ishtar_common.change_import", @@ -276,7 +276,7 @@ urlpatterns = [ )(views.import_get_status), name="import_get_status", ), - url( + re_path( r"^import-list-old/$", check_permissions( ["ishtar_common.view_import", "ishtar_common.change_import", @@ -284,78 +284,78 @@ urlpatterns = [ )(views.ImportOldListView.as_view()), name="old_imports", ), - url( + re_path( r"^import-delete/(?P<pk>[0-9]+)/$", check_permissions( ["ishtar_common.delete_import", "ishtar_common.delete_own_import"] )(views.ImportDeleteView.as_view()), name="import_delete", ), - url( + re_path( r"^import-group-delete/(?P<pk>[0-9]+)/$", check_permissions( ["ishtar_common.delete_import", "ishtar_common.delete_own_import"] )(views.ImportGroupDeleteView.as_view()), name="import_group_delete", ), - url( + re_path( r"^import-link-unmatched/(?P<pk>[0-9]+)/$", check_permissions( ["ishtar_common.change_import", "ishtar_common.change_own_import"] )(views.ImportMatchView.as_view()), name="import_link_unmatched", ), - url( + re_path( r"^import-csv-view/(?P<target>source|result|match|error)/(?P<group>group\-)?(?P<pk>[0-9]+)/$", check_permissions( ["ishtar_common.view_import", "ishtar_common.view_own_import"] )(views.ImportCSVView.as_view()), name="import_display_csv", ), - url( + re_path( r"^import-step-by-step/all/(?P<pk>[0-9]+)/(?P<line_number>[0-9]+)/$", views.ImportStepByStepView.as_view(), name="import_step_by_step_all", kwargs={"all_pages": True}, ), - url( + re_path( r"^import-step-by-step/(?P<pk>[0-9]+)/(?P<line_number>[0-9]+)/$", views.ImportStepByStepView.as_view(), name="import_step_by_step", ), - url( + re_path( r"^import-pre-form/(?P<import_id>[0-9]+)/$", check_permissions( ["ishtar_common.change_import", "ishtar_common.change_own_import"] )(views.ImportPreFormView.as_view()), name="import_pre_import_form", ), - url( + re_path( r"^import-ignore-line/(?P<line_id>[0-9]+)/$", check_permissions( ["ishtar_common.change_import", "ishtar_common.change_own_import"] )(views.line_error), name="import_ignore_line", ), - url(r"^profile(?:/(?P<pk>[0-9]+))?/$", views.ProfileEdit.as_view(), name="profile"), - url( + re_path(r"^profile(?:/(?P<pk>[0-9]+))?/$", views.ProfileEdit.as_view(), name="profile"), + re_path( r"^save-search/(?P<app_label>[a-z-]+)/(?P<model>[a-z-]+)/$", views.SearchQueryEdit.as_view(), name="save-search-query", ), - url( + re_path( r"^bookmarks/(?P<app_label>[a-z-]+)/(?P<model>[a-z-]+)/$", views.BookmarkList.as_view(), name="bookmark-list", ), - url(r"^bookmark/(?P<pk>[0-9]+)/$", views.get_bookmark, name="bookmark"), - url( + re_path(r"^bookmark/(?P<pk>[0-9]+)/$", views.get_bookmark, name="bookmark"), + re_path( r"^bookmark/delete/(?P<pk>[0-9]+)/$", views.SearchQueryDelete.as_view(), name="bookmark-delete", ), - url(r"^alerts/$", views.AlertList.as_view(), name="alert-list"), - url( + re_path(r"^alerts/$", views.AlertList.as_view(), name="alert-list"), + re_path( r"^success(?:/(?P<context>[a-z-]+)(?:/(?P<arg>[0-9a-z-|]+))?)?/$", views.SuccessView.as_view(), name="success", @@ -377,77 +377,77 @@ actions = r"|".join(actions) # other views urlpatterns += [ # General - url( + re_path( r"update-current-item/$", views.update_current_item, name="update-current-item" ), - url( + re_path( r"pin/(?P<item_type>[a-z-]+)/(?P<pk>\d+)/$", views.update_current_item, name="pin", ), - url(r"pin-search/(?P<item_type>[a-z-]+)/$", views.pin_search, name="pin-search"), - url(r"unpin/(?P<item_type>[a-z-]+)/$", views.unpin, name="unpin"), - url( + re_path(r"pin-search/(?P<item_type>[a-z-]+)/$", views.pin_search, name="pin-search"), + re_path(r"unpin/(?P<item_type>[a-z-]+)/$", views.unpin, name="unpin"), + re_path( r"get-by-importer/(?P<slug>[\w-]+)/(?P<type>[a-z-]+)?$", views.get_by_importer, name="get-by-importer", ), - url( + re_path( r"new-person/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$", views.new_person, name="new-person", ), - url( + re_path( r"modify-person/(?:(?P<parent_name>[^/]+)/)?(?P<pk>[\d+]+)/$", views.modify_person, name="modify-person", ), - url(r"detail-person/(?P<pk>[\d+]+)/$", views.detail_person, name="detail-person"), - url( + re_path(r"detail-person/(?P<pk>[\d+]+)/$", views.detail_person, name="detail-person"), + re_path( r"modify-organization/(?:(?P<parent_name>[^/]+)/)?(?P<pk>[\d+]+)/$", views.modify_organization, name="modify-organization", ), - url( + re_path( r"detail-organization/(?P<pk>[\d+]+)/$", views.detail_organization, name="detail-organization", ), - url( + re_path( r"new-person-noorga/" r"(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$", views.new_person_noorga, name="new-person-noorga", ), - url(r"autocomplete-area/$", views.autocomplete_area, name="autocomplete-area"), - url(r"autocomplete-user/$", views.autocomplete_user, name="autocomplete-user"), - url( + re_path(r"autocomplete-area/$", views.autocomplete_area, name="autocomplete-area"), + re_path(r"autocomplete-user/$", views.autocomplete_user, name="autocomplete-user"), + re_path( r"autocomplete-ishtaruser/$", views.autocomplete_ishtaruser, name="autocomplete-ishtaruser", ), - url( + re_path( r"autocomplete-person(?:/([0-9_]+))?(?:/([0-9_]*))?/(user)?$", views.autocomplete_person, name="autocomplete-person", ), - url( + re_path( r"autocomplete-person-permissive(?:/([0-9_]+))?(?:/([0-9_]*))?" r"/(user)?$", views.autocomplete_person_permissive, name="autocomplete-person-permissive", ), - url(r"get-person/(?P<type>.+)?$", views.get_person, name="get-person"), - url( + re_path(r"get-person/(?P<type>.+)?$", views.get_person, name="get-person"), + re_path( r"get-person-full/(?P<type>.+)?$", views.get_person, name="get-person-full", kwargs={"full": True}, ), - url( + re_path( r"get-person-for-account/(?P<type>.+)?$", views.get_person_for_account, name="get-person-for-account", ), - url( + re_path( r"show-person(?:/(?P<pk>.+))?/(?P<type>.+)?$", views.show_person, name="show-person", @@ -462,17 +462,17 @@ urlpatterns += [ check_permissions(["ishtaradmin"])(views.show_ishtaruser), name="show-ishtaruser", ), - url( + re_path( r"show-biographicalnote(?:/(?P<pk>.+))?/(?P<type>.+)?$", views.show_biographical_note, name="show-biographicalnote", ), - url( + re_path( r"new-biographicalnote/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$", views.new_biographical_note, name="new-biographicalnote", ), - url( + re_path( r"^biographicalnote-qa-edit/(?P<pks>[0-9-]+)?/$", check_permissions( ["ishtar_common.change_biographicalnote", @@ -480,129 +480,129 @@ urlpatterns += [ )(views.QABiographicalNoteForm.as_view()), name="biographicalnote-qa-edit", ), - url( + re_path( r"department-by-state/(?P<state_id>.+)?$", views.department_by_state, name="department-by-state", ), - url( + re_path( r"show-area(?:/(?P<pk>.+))?/(?P<type>.+)?$", views.show_area, name="show-area", ), - url( + re_path( r"show-town(?:/(?P<pk>.+))?/(?P<type>.+)?$", views.show_town, name="show-town", ), - url(r"autocomplete-town/?$", views.autocomplete_town, name="autocomplete-town"), - url( + re_path(r"autocomplete-town/?$", views.autocomplete_town, name="autocomplete-town"), + re_path( r"autocomplete-advanced-town/(?P<department_id>[0-9]+[ABab]?)?$", views.autocomplete_advanced_town, name="autocomplete-advanced-town", ), - url( + re_path( r"autocomplete-department/?$", views.autocomplete_department, name="autocomplete-department", ), - url( + re_path( r"new-author/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$", views.new_author, name="new-author", ), - url( + re_path( r"autocomplete-author/$", views.autocomplete_author, name="autocomplete-author" ), - url( + re_path( r"new-organization/(?:(?P<parent_name>[^/]+)/)?" r"(?:(?P<limits>[^/]+)/)?$", views.new_organization, name="new-organization", ), - url( + re_path( r"get-organization/(?P<type>.+)?$", views.get_organization, name="get-organization", ), - url( + re_path( r"get-organization-full/(?P<type>.+)?$", views.get_organization, name="get-organization-full", kwargs={"full": True}, ), - url( + re_path( r"show-organization(?:/(?P<pk>.+))?/(?P<type>.+)?$", views.show_organization, name="show-organization", ), - url( + re_path( r"show-import(?:/(?P<pk>\d+))?/(?P<type>odt|pdf)?$", views.show_import, name="show-import", ), - url(r"autocomplete-import/$", views.autocomplete_import, name="autocomplete-import"), - url( + re_path(r"autocomplete-import/$", views.autocomplete_import, name="autocomplete-import"), + re_path( r"show-importgroup(?:/(?P<pk>\d+))?/(?P<type>odt|pdf)?$", views.show_import_group, name="show-importgroup", ), - url( + re_path( r"autocomplete-organization/([0-9_]+)?$", views.autocomplete_organization, name="autocomplete-organization", ), - url( + re_path( r"autocomplete-biographical-note/$", views.autocomplete_biographical_note, name="autocomplete-biographicalnote" ), - url(r"changelog/(?:(?P<page>\d+)/)?", views.ChangelogView.as_view(), name="changelog"), - url(r"person-merge/(?:(?P<page>\d+)/)?$", views.person_merge, name="person_merge"), - url( + re_path(r"changelog/(?:(?P<page>\d+)/)?", views.ChangelogView.as_view(), name="changelog"), + re_path(r"person-merge/(?:(?P<page>\d+)/)?$", views.person_merge, name="person_merge"), + re_path( r"person-manual-merge/$", views.PersonManualMerge.as_view(), name="person_manual_merge", ), - url( + re_path( r"person-manual-merge-items/(?P<pks>[0-9_]+?)/$", views.PersonManualMergeItems.as_view(), name="person_manual_merge_items", ), - url( + re_path( r"organization-merge/(?:(?P<page>\d+)/)?$", views.organization_merge, name="organization_merge", ), - url( + re_path( r"orga-manual-merge/$", views.OrgaManualMerge.as_view(), name="orga_manual_merge", ), - url( + re_path( r"orga-manual-merge-items/(?P<pks>[0-9_]+?)/$", views.OrgaManualMergeItems.as_view(), name="orga_manual_merge_items", ), - url(r"reset/$", views.reset_wizards, name="reset_wizards"), - url( + re_path(r"reset/$", views.reset_wizards, name="reset_wizards"), + re_path( r"activate-all-search/$", views.activate_all_search, name="activate-all-search" ), - url( + re_path( r"activate-own-search/$", views.activate_own_search, name="activate-own-search" ), - url( + re_path( r"activate-advanced-menu/$", views.activate_advanced_shortcut_menu, name="activate-advanced-menu", ), - url( + re_path( r"activate-simple-menu/$", views.activate_simple_shortcut_menu, name="activate-simple-menu", ), - url(r"hide-shortcut-menu/$", views.hide_shortcut_menu, name="hide-shortcut-menu"), - url(r"show-shortcut-menu/$", views.show_shortcut_menu, name="show-shortcut-menu"), - url( + re_path(r"hide-shortcut-menu/$", views.hide_shortcut_menu, name="hide-shortcut-menu"), + re_path(r"show-shortcut-menu/$", views.show_shortcut_menu, name="show-shortcut-menu"), + re_path( r"regenerate-external-id/$", views.regenerate_external_id, name="regenerate-external-id", @@ -612,66 +612,66 @@ urlpatterns += [ views.regenerate_permissions, name="regenerate-permissions", ), - url( + re_path( r"document/search/(?P<step>.+)?$", check_permissions( ["ishtar_common.view_document", "ishtar_common.view_own_document"] )(views.document_search_wizard), name="search-document", ), - url( + re_path( r"document/search/(?P<step>.+)?$", check_permissions( ["ishtar_common.view_document", "ishtar_common.view_own_document"] )(views.document_search_wizard), name="document_search", ), - url( + re_path( r"document/create/$", check_permissions( ["ishtar_common.add_document"] )(views.DocumentCreateView.as_view()), name="create-document", ), - url( + re_path( r"document/edit/$", check_permissions( ["ishtar_common.change_document", "ishtar_common.change_own_document"] )(views.DocumentSelectView.as_view()), name="edit-document", ), - url( + re_path( r"document/edit/(?P<pk>.+)/$", check_permissions( ["ishtar_common.change_document", "ishtar_common.change_own_document"] )(views.DocumentEditView.as_view()), name="edit-document", ), - url( + re_path( r"document/delete/(?P<step>.+)?$", check_permissions( ["ishtar_common.delete_document", "ishtar_common.delete_own_document"] )(views.document_deletion_wizard), name="document_deletion", ), - url( + re_path( r"autocomplete-document/$", views.autocomplete_document, name="autocomplete-document", ), - url( + re_path( r"document/shortcut/delete/(?P<pk>.+)/$", views.document_delete, name="delete-document", ), - url( + re_path( r"^document-qa-bulk-update/(?P<pks>[0-9-]+)?/$", check_permissions( ["ishtar_common.change_document", "ishtar_common.change_own_document"] )(views.QADocumentForm.as_view()), name="document-qa-bulk-update", ), - url( + re_path( r"^document-qa-bulk-update/(?P<pks>[0-9-]+)?/confirm/$", check_permissions( ["ishtar_common.change_document", "ishtar_common.change_own_document"] @@ -679,7 +679,7 @@ urlpatterns += [ name="document-qa-bulk-update-confirm", kwargs={"confirm": True}, ), - url( + re_path( r"^document-qa-duplicate/(?P<pks>[0-9-]+)?/$", check_permissions( ["ishtar_common.change_document", "ishtar_common.change_own_document"] @@ -693,38 +693,38 @@ urlpatterns += [ )(views.QADocumentUnlink.as_view()), name="document-qa-unlink", ), - url( + re_path( r"^document-qa-packaging/(?P<pks>[0-9-]+)?/$", check_permissions( ["ishtar_common.change_document", "ishtar_common.change_own_document"] )(views.QADocumentPackagingFormView.as_view()), name="document-qa-packaging", ), - url( + re_path( r"autocomplete-documenttag/$", views.autocomplete_documenttag, name="autocomplete-documenttag", ), - url( + re_path( r"new-documenttag/(?:(?P<parent_name>[^/]+)/)?" r"(?:(?P<limits>[^/]+)/)?$", views.new_document_tag, name="new-documenttag", ), - url( + re_path( r"geo/create/(?P<app_source>[-\w]+)/(?P<model_source>[-\w]+)/(?P<source_pk>\d+)/$", check_permissions( ["ishtar_common.add_geovectordata"] )(views.GeoPreCreateView.as_view()), name="create-pre-geo", ), - url( + re_path( r"geo/create/(?P<app_source>[-\w]+)/(?P<model_source>[-\w]+)/(?P<source_pk>\d+)/(?P<geom_type>[-\w]+)/$", check_permissions( ["ishtar_common.add_geovectordata"] )(views.GeoCreateView.as_view()), name="create-geo", ), - url( + re_path( r"geo/edit/(?P<pk>\d+)/$", check_permissions( ["ishtar_common.change_geovectordata", @@ -732,7 +732,7 @@ urlpatterns += [ )(views.GeoEditView.as_view()), name="edit-geo", ), - url( + re_path( r"geo/delete/(?P<pk>\d+)/$", check_permissions( ["ishtar_common.delete_geovectordata", @@ -740,7 +740,7 @@ urlpatterns += [ )(views.GeoDeleteView.as_view()), name="delete-geo", ), - url( + re_path( r"^qa-not-available(?:/(?P<context>[0-9a-z-]+))?/$", views.QANotAvailable.as_view(), name="qa-not-available", @@ -765,7 +765,7 @@ urlpatterns += [ urlpatterns += get_urls_for_model(models.Document, views, own=True) urlpatterns += [ - url(r"(?P<action_slug>" + actions + r")/$", views.action, name="action"), + re_path(r"(?P<action_slug>" + actions + r")/$", views.action, name="action"), ] |