diff options
Diffstat (limited to 'archaeological_warehouse')
| -rw-r--r-- | archaeological_warehouse/forms.py | 2 | ||||
| -rw-r--r-- | archaeological_warehouse/ishtar_menu.py | 2 | ||||
| -rw-r--r-- | archaeological_warehouse/models.py | 2 | ||||
| -rw-r--r-- | archaeological_warehouse/urls.py | 95 | ||||
| -rw-r--r-- | archaeological_warehouse/views.py | 2 |
5 files changed, 51 insertions, 52 deletions
diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py index 8a16a53ce..c43fc513a 100644 --- a/archaeological_warehouse/forms.py +++ b/archaeological_warehouse/forms.py @@ -27,7 +27,7 @@ from django.conf import settings from django.core.validators import validate_slug from django.forms.formsets import formset_factory -from ishtar_common.utils import ugettext_lazy as _ +from ishtar_common.utils import gettext_lazy as _ from ishtar_common.models import ( Area, diff --git a/archaeological_warehouse/ishtar_menu.py b/archaeological_warehouse/ishtar_menu.py index ae66e165c..5c758341a 100644 --- a/archaeological_warehouse/ishtar_menu.py +++ b/archaeological_warehouse/ishtar_menu.py @@ -17,7 +17,7 @@ # See the file COPYING for details. -from ishtar_common.utils import ugettext_lazy as _ +from ishtar_common.utils import gettext_lazy as _ from ishtar_common.menu_base import SectionItem, MenuItem diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 2c6feaffc..b4206e337 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -29,7 +29,7 @@ from django.db.models import Q, Max from django.db.models.signals import post_save, post_delete, m2m_changed, pre_delete from django.template.defaultfilters import slugify from django.urls import reverse, reverse_lazy -from ishtar_common.utils import ugettext_lazy as _, pgettext_lazy +from ishtar_common.utils import gettext_lazy as _, pgettext_lazy from django.apps import apps from ishtar_common.data_importer import post_importer_action, pre_importer_action, \ diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py index 395204c19..47f08099e 100644 --- a/archaeological_warehouse/urls.py +++ b/archaeological_warehouse/urls.py @@ -17,8 +17,7 @@ # See the file COPYING for details. -from django.conf.urls import url -from django.urls import path +from django.urls import path, re_path from ishtar_common.utils import check_permissions from ishtar_common.views import QALinkView @@ -29,7 +28,7 @@ from archaeological_warehouse import models, views, views_api # forms urlpatterns = [ - url( + re_path( r"warehouse_packaging/(?P<step>.+)?$", # AFAC check_permissions( ["archaeological_finds.change_find", @@ -37,75 +36,75 @@ urlpatterns = [ )(views.warehouse_packaging_wizard), name="warehouse_packaging", ), - url( + re_path( r"new-warehouse/(?P<parent_name>.+)?/$", views.new_warehouse, name="new-warehouse", ), - url( + re_path( r"^show-warehouse(?:/(?P<pk>.+))?/(?P<type>.+)?$", views.show_warehouse, name=models.Warehouse.SHOW_URL, ), - url( + re_path( r"^show-historized-warehouse/(?P<pk>.+)?/(?P<date>.+)?$", views.show_warehouse, name="show-historized-warehouse", ), - url( + re_path( r"^revert-warehouse/(?P<pk>.+)/(?P<date>.+)$", views.revert_warehouse, name="revert-warehouse", ), - url( + re_path( r"autocomplete-warehouse/$", views.autocomplete_warehouse, name="autocomplete-warehouse", ), - url( + re_path( r"new-container/(?P<parent_name>.+)?/$", views.new_container, name="new-container", ), - url(r"get-container/(?P<type>.+)?$", views.get_container, name="get-container"), - url( + re_path(r"get-container/(?P<type>.+)?$", views.get_container, name="get-container"), + re_path( r"get-divisions-container/(?P<type>.+)?$", views.get_divisions_container, name="get-divisions-container", ), - url( + re_path( r"get-non-divisions-container/(?P<type>.+)?$", views.get_non_divisions_container, name="get-non-divisions-container", ), - url(r"get-warehouse/(?P<type>.+)?$", views.get_warehouse, name="get-warehouse"), - url( + re_path(r"get-warehouse/(?P<type>.+)?$", views.get_warehouse, name="get-warehouse"), + re_path( r"get-warehouse-shortcut/(?P<type>.+)?$", views.get_warehouse, name="get-warehouse-shortcut", kwargs={"full": "shortcut"}, ), - url( + re_path( r"autocomplete-container/(?P<warehouse_id>\d+)?(?:/)?$", views.autocomplete_container, name="autocomplete-container", ), - url( + re_path( r"^show-container(?:/(?P<pk>.+))?/(?P<type>.+)?$", views.show_container, name=models.Container.SHOW_URL, ), - url( + re_path( r"^show-historized-container/(?P<pk>.+)?/(?P<date>.+)?$", views.show_container, name="show-historized-container", ), - url( + re_path( r"^revert-container/(?P<pk>.+)/(?P<date>.+)$", views.revert_container, name="revert-container", ), - url( + re_path( r"^warehouse_search/(?P<step>.+)?$", check_permissions( ["archaeological_warehouse.view_warehouse", @@ -113,14 +112,14 @@ urlpatterns = [ )(views.warehouse_search_wizard), name="warehouse_search", ), - url( + re_path( r"^warehouse_creation/(?P<step>.+)?$", check_permissions( ["archaeological_warehouse.add_warehouse"] )(views.warehouse_creation_wizard), name="warehouse_creation", ), - url( + re_path( r"^warehouse_modification/(?P<step>.+)?$", check_permissions( ["archaeological_warehouse.change_warehouse", @@ -128,12 +127,12 @@ urlpatterns = [ )(views.warehouse_modification_wizard), name="warehouse_modification", ), - url( + re_path( r"warehouse-modify/(?P<pk>.+)/$", views.warehouse_modify, name="warehouse_modify", ), - url( + re_path( r"^warehouse_deletion/(?P<step>.+)?$", check_permissions( ["archaeological_warehouse.delete_warehouse", @@ -141,24 +140,24 @@ urlpatterns = [ )(views.warehouse_deletion_wizard), name="warehouse_deletion", ), - url( + re_path( r"warehouse-delete/(?P<pk>.+)/$", views.warehouse_delete, name="delete-warehouse", ), - url( + re_path( r"^warehouse-qa-lock/(?P<pks>[0-9-]+)?/$", views.QAWarehouseLockView.as_view(), name="warehouse-qa-lock", kwargs={"model": models.Warehouse}, ), - url( + re_path( r"^warehouse-qa-link/(?P<pks>[0-9-]+)?/$", QALinkView.as_view(), name="warehouse-qa-link", kwargs={"model": models.Warehouse, "url": "warehouse-qa-link"}, ), - url( + re_path( r"^warehouse-qa-bulk-update/(?P<pks>[0-9-]+)?/$", check_permissions([ "archaeological_warehouse.change_warehouse", @@ -166,7 +165,7 @@ urlpatterns = [ ])(views.QAWarehouseForm.as_view()), name="warehouse-qa-bulk-update", ), - url( + re_path( r"^warehouse-qa-bulk-update/(?P<pks>[0-9-]+)?/confirm/$", check_permissions([ "archaeological_warehouse.change_warehouse", @@ -175,7 +174,7 @@ urlpatterns = [ name="warehouse-qa-bulk-update-confirm", kwargs={"confirm": True}, ), - url( + re_path( r"^container-add-treatment/(?P<pk>[0-9-]+)/$", check_permissions( ["archaeological_finds.change_find", @@ -183,7 +182,7 @@ urlpatterns = [ )(views.container_treatment_add), name="container-add-treatment", ), - url( + re_path( r"^container_search/(?P<step>.+)?$", check_permissions( ["archaeological_warehouse.view_container", @@ -191,14 +190,14 @@ urlpatterns = [ )(views.container_search_wizard), name="container_search", ), - url( + re_path( r"^container_creation/(?P<step>.+)?$", check_permissions( ["archaeological_warehouse.add_container"] )(views.container_creation_wizard), name="container_creation", ), - url( + re_path( r"^container_modification/(?P<step>.+)?$", check_permissions( ["archaeological_warehouse.change_container", @@ -206,12 +205,12 @@ urlpatterns = [ )(views.container_modification_wizard), name="container_modification", ), - url( + re_path( r"container-modify/(?P<pk>.+)/$", views.container_modify, name="container_modify", ), - url( + re_path( r"^container_deletion/(?P<step>.+)?$", check_permissions( ["archaeological_warehouse.delete_container", @@ -219,12 +218,12 @@ urlpatterns = [ )(views.container_deletion_wizard), name="container_deletion", ), - url( + re_path( r"container-delete/(?P<pk>.+)/$", views.container_delete, name="delete-container", ), - url( + re_path( r"^container-qa-bulk-update/(?P<pks>[0-9-]+)?/$", check_permissions( ["archaeological_warehouse.change_container", @@ -232,7 +231,7 @@ urlpatterns = [ )(views.QAContainerForm.as_view()), name="container-qa-bulk-update", ), - url( + re_path( r"^container-qa-bulk-update/(?P<pks>[0-9-]+)?/confirm/$", check_permissions( ["archaeological_warehouse.change_container", @@ -241,7 +240,7 @@ urlpatterns = [ name="container-qa-bulk-update-confirm", kwargs={"confirm": True}, ), - url( + re_path( r"^container-qa-move/(?P<pks>[0-9-]+)?/$", check_permissions( ["archaeological_warehouse.change_container", @@ -249,52 +248,52 @@ urlpatterns = [ )(views.QAContainerMoveForm.as_view()), name="container-qa-move", ), - url( + re_path( r"^container-qa-lock/(?P<pks>[0-9-]+)?/$", views.QAContainerLockView.as_view(), name="container-qa-lock", kwargs={"model": models.Container}, ), - url( + re_path( r"^container-qa-link/(?P<pks>[0-9-]+)?/$", QALinkView.as_view(), name="container-qa-link", kwargs={"model": models.Container, "url": "container-qa-link"}, ), - url( + re_path( r"container-merge/(?:(?P<page>\d+)/)?$", views.container_merge, name="container_merge", ), - url( + re_path( r"container-manual-merge/$", views.ContainerManualMerge.as_view(), name="container_manual_merge", ), - url( + re_path( r"container-manual-merge-items/(?P<pks>[0-9_]+?)/$", views.ContainerManualMergeItems.as_view(), name="container_manual_merge_items", ), - url( + re_path( r"generate-stats-container/(?P<pk>.+)/", views.GenerateStatsContainer.as_view(), name="generate-stats-container", ), - url( + re_path( r"generate-stats-warehouse/(?P<pk>.+)/", views.GenerateStatsWarehouse.as_view(), name="generate-stats-warehouse", ), - url( + re_path( r"api/facets/warehouse/$", views_api.FacetWarehouseAPIView.as_view(), name="api-facets-warehouse" ), - url( + re_path( r"api/search/warehouse/$", views_api.SearchWarehouseAPI.as_view(), name="api-search-warehouse" ), - url( + re_path( r"api/search/container/$", views_api.SearchContainerAPI.as_view(), name="api-search-container" ), diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py index bab0140b6..2d77cfe92 100644 --- a/archaeological_warehouse/views.py +++ b/archaeological_warehouse/views.py @@ -27,7 +27,7 @@ from django.views.generic.edit import FormView from django.http import HttpResponse, Http404, HttpResponseRedirect from django.shortcuts import redirect from django.urls import reverse -from ishtar_common.utils import ugettext_lazy as _, pgettext_lazy +from ishtar_common.utils import gettext_lazy as _, pgettext_lazy from archaeological_warehouse import models from archaeological_warehouse import forms |