summaryrefslogtreecommitdiff
path: root/archaeological_operations/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'archaeological_operations/urls.py')
-rw-r--r--archaeological_operations/urls.py161
1 files changed, 93 insertions, 68 deletions
diff --git a/archaeological_operations/urls.py b/archaeological_operations/urls.py
index 7f5080c39..ba96c64b2 100644
--- a/archaeological_operations/urls.py
+++ b/archaeological_operations/urls.py
@@ -21,7 +21,7 @@ from django.conf.urls import url
from django.urls import path, register_converter
from ishtar_common import urls_converters
-from ishtar_common.utils import check_rights
+from ishtar_common.utils import check_permissions
from archaeological_operations import views
from archaeological_operations import views_api
from archaeological_operations import models
@@ -29,27 +29,27 @@ from archaeological_operations import models
register_converter(urls_converters.UnderscoreSlug, "uslug")
-# be carreful: each check_rights must be relevant with ishtar_menu
+# be carreful: each check_permissions must be relevant with ishtar_menu
# forms
urlpatterns = [
url(
r"operation_administrativeactop_search/(?P<step>.+)?$",
- check_rights(["change_administrativeact"])(
+ check_permissions(["archaeological_operations.change_administrativeact"])(
views.operation_administrativeactop_search_wizard
),
name="operation_administrativeactop_search",
),
url(
r"operation_administrativeactop/(?P<step>.+)?$",
- check_rights(["change_administrativeact"])(
+ check_permissions(["archaeological_operations.change_administrativeact"])(
views.operation_administrativeactop_wizard
),
name="operation_administrativeactop",
),
url(
r"operation_administrativeactop_modification/(?P<step>.+)?$",
- check_rights(["change_administrativeact"])(
+ check_permissions(["archaeological_operations.change_administrativeact"])(
views.operation_administrativeactop_modification_wizard
),
name="operation_administrativeactop_modification",
@@ -61,7 +61,7 @@ urlpatterns = [
),
url(
r"operation_administrativeactop_deletion/(?P<step>.+)?$",
- check_rights(["change_administrativeact"])(
+ check_permissions(["archaeological_operations.change_administrativeact"])(
views.operation_administrativeactop_deletion_wizard
),
name="operation_administrativeactop_deletion",
@@ -73,29 +73,34 @@ urlpatterns = [
),
url(
r"operation_search/(?P<step>.+)?$",
- check_rights(["view_operation", "view_own_operation"])(
- views.operation_search_wizard
- ),
+ check_permissions(
+ ["archaeological_operations.view_operation",
+ "archaeological_operations.view_own_operation"]
+ )(views.operation_search_wizard),
name="operation_search",
),
url(
r"^operation-add-adminact/(?P<pk>[0-9-]+)/$",
- check_rights(["add_administrativeact"])(views.operation_adminact_add),
+ check_permissions(
+ ["archaeological_operations.add_administrativeact"]
+ )(views.operation_adminact_add),
name="operation-add-adminact",
),
url(
r"operation_creation/(?P<step>.+)?$",
- check_rights(["add_operation", "add_own_operation"])(
- views.operation_creation_wizard
- ),
+ check_permissions(
+ ["archaeological_operations.add_operation",
+ "archaeological_operations.add_own_operation"]
+ )(views.operation_creation_wizard),
name="operation_creation",
),
url(r"operation_add/(?P<file_id>\d+)$", views.operation_add, name="operation_add"),
url(
r"operation_modification/(?P<step>.+)?$",
- check_rights(["change_operation", "change_own_operation"])(
- views.operation_modification_wizard
- ),
+ check_permissions(
+ ["archaeological_operations.change_operation",
+ "archaeological_operations.change_own_operation"]
+ )(views.operation_modification_wizard),
name="operation_modification",
),
url(
@@ -105,14 +110,17 @@ urlpatterns = [
),
url(
r"operation_closing/(?P<step>.+)?$",
- check_rights(["change_operation"])(views.operation_closing_wizard),
+ check_permissions(
+ ["archaeological_operations.change_operation"]
+ )(views.operation_closing_wizard),
name="operation_closing",
),
url(
r"operation_deletion/(?P<step>.+)?$",
- check_rights(["change_operation", "change_own_operation"])(
- views.operation_deletion_wizard
- ),
+ check_permissions(
+ ["archaeological_operations.change_operation",
+ "archaeological_operations.change_own_operation"]
+ )(views.operation_deletion_wizard),
name="operation_deletion",
),
url(
@@ -122,9 +130,10 @@ urlpatterns = [
),
url(
r"administrativact_register/(?P<step>.+)?$",
- check_rights(["view_administrativeact", "view_own_administrativeact"])(
- views.administrativact_register_wizard
- ),
+ check_permissions(
+ ["archaeological_operations.view_administrativeact",
+ "archaeological_operations.view_own_administrativeact"]
+ )(views.administrativact_register_wizard),
name="administrativact_register",
),
url(
@@ -267,29 +276,34 @@ urlpatterns = [
),
url(
r"site_search/(?P<step>.+)?$",
- check_rights(["view_archaeologicalsite", "view_own_archaeologicalsite"])(
- views.site_search_wizard
- ),
+ check_permissions(
+ ["archaeological_operations.view_archaeologicalsite",
+ "archaeological_operations.view_own_archaeologicalsite"]
+ )(views.site_search_wizard),
name="site_search",
),
url(
r"site_creation/(?P<step>.+)?$",
- check_rights(["add_archaeologicalsite", "add_own_archaeologicalsite"])(
- views.site_creation_wizard
- ),
+ check_permissions(
+ ["archaeological_operations.add_archaeologicalsite",
+ "archaeological_operations.add_own_archaeologicalsite"]
+ )(views.site_creation_wizard),
name="site_creation",
),
url(
r"site_modification/(?P<step>.+)?$",
- check_rights(["change_archaeologicalsite", "change_own_archaeologicalsite"])(
- views.site_modification_wizard
- ),
+ check_permissions(
+ ["archaeological_operations.change_archaeologicalsite",
+ "archaeological_operations.change_own_archaeologicalsite"]
+ )(views.site_modification_wizard),
name="site_modification",
),
url(r"site_modify/(?P<pk>.+)/$", views.site_modify, name="site_modify"),
url(
r"site_deletion/(?P<step>.+)?$",
- check_rights(["change_archaeologicalsite"])(views.site_deletion_wizard),
+ 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"),
@@ -310,59 +324,67 @@ urlpatterns = [
),
url(
r"^operation-relations-modify/(?P<pk>.+)/$",
- check_rights(["change_operation", "change_own_operation"])(
- views.operation_modify_relations
- ),
+ check_permissions(
+ ["archaeological_operations.change_operation",
+ "archaeological_operations.change_own_operation"]
+ )(views.operation_modify_relations),
name="operation-relation-modify",
),
path(
"operation-site-relations-modify/<int:pk>/",
- check_rights(["change_operation", "change_own_operation"])(
- views.operation_site_modify_relations
- ),
+ check_permissions(
+ ["archaeological_operations.change_operation",
+ "archaeological_operations.change_own_operation"]
+ )(views.operation_site_modify_relations),
name="operation-site-relations-modify",
),
path(
"operation-site-relations-modify/<int:pk>/<uslug:window_id>/",
- check_rights(["change_operation", "change_own_operation"])(
- views.operation_site_modify_relations
- ),
+ check_permissions(
+ ["archaeological_operations.change_operation",
+ "archaeological_operations.change_own_operation"]
+ )(views.operation_site_modify_relations),
name="operation-site-relations-modify",
),
path(
"site-operation-relations-modify/<int:pk>/",
- check_rights(["change_operation", "change_own_operation"])(
- views.site_operation_modify_relations
- ),
+ check_permissions(
+ ["archaeological_operations.change_operation",
+ "archaeological_operations.change_own_operation"]
+ )(views.site_operation_modify_relations),
name="site-operation-relations-modify",
),
path(
"site-operation-relations-modify/<int:pk>/<uslug:window_id>/",
- check_rights(["change_operation", "change_own_operation"])(
- views.site_operation_modify_relations
- ),
+ check_permissions(
+ ["archaeological_operations.change_operation",
+ "archaeological_operations.change_own_operation"]
+ )(views.site_operation_modify_relations),
name="site-operation-relations-modify",
),
url(
r"^operation-qa-bulk-update/(?P<pks>[0-9-]+)?/$",
- check_rights(["change_operation", "change_own_operation"])(
- views.QAOperationForm.as_view()
- ),
+ check_permissions(
+ ["archaeological_operations.change_operation",
+ "archaeological_operations.change_own_operation"]
+ )(views.QAOperationForm.as_view()),
name="operation-qa-bulk-update",
),
url(
r"^operation-qa-bulk-update/(?P<pks>[0-9-]+)?/confirm/$",
- check_rights(["change_operation", "change_own_operation"])(
- views.QAOperationForm.as_view()
- ),
+ check_permissions(
+ ["archaeological_operations.change_operation",
+ "archaeological_operations.change_own_operation"]
+ )(views.QAOperationForm.as_view()),
name="operation-qa-bulk-update-confirm",
kwargs={"confirm": True},
),
url(
r"^operation-qa-duplicate/(?P<pks>[0-9-]+)?/$",
- check_rights(["change_operation", "change_own_operation"])(
- views.QAOperationdDuplicateFormView.as_view()
- ),
+ check_permissions(
+ ["archaeological_operations.change_operation",
+ "archaeological_operations.change_own_operation"]
+ )(views.QAOperationdDuplicateFormView.as_view()),
name="operation-qa-duplicate",
),
url(
@@ -373,9 +395,10 @@ urlpatterns = [
),
url(
r"^site-qa-duplicate/(?P<pks>[0-9-]+)?/$",
- check_rights(["change_archaeologicalsite", "change_own_archaeologicalsite"])(
- views.QAArchaeologicalSiteDuplicateFormView.as_view()
- ),
+ check_permissions(
+ ["archaeological_operations.change_archaeologicalsite",
+ "archaeological_operations.change_own_archaeologicalsite"]
+ )(views.QAArchaeologicalSiteDuplicateFormView.as_view()),
name="site-qa-duplicate",
),
url(
@@ -386,29 +409,31 @@ urlpatterns = [
),
url(
r"^site-qa-bulk-update/(?P<pks>[0-9-]+)?/$",
- check_rights(["change_archaeologicalsite", "change_own_archaeologicalsite"])(
- views.QAArchaeologicalSiteForm.as_view()
- ),
+ check_permissions(
+ ["archaeological_operations.change_archaeologicalsite",
+ "archaeological_operations.change_own_archaeologicalsite"]
+ )(views.QAArchaeologicalSiteForm.as_view()),
name="site-qa-bulk-update",
),
url(
r"^site-qa-bulk-update/(?P<pks>[0-9-]+)?/confirm/$",
- check_rights(["change_archaeologicalsite", "change_own_archaeologicalsite"])(
- views.QAArchaeologicalSiteForm.as_view()
- ),
+ check_permissions(
+ ["archaeological_operations.change_archaeologicalsite",
+ "archaeological_operations.change_own_archaeologicalsite"]
+ )(views.QAArchaeologicalSiteForm.as_view()),
name="site-qa-bulk-update-confirm",
kwargs={"confirm": True},
),
url(
r"^site-add-operation/(?P<pks>[0-9-]+)?/$",
- check_rights(["change_operation"])(
+ check_permissions(["archaeological_operations.change_operation"])(
views.site_add_operation
),
name="site-add-operation",
),
url(
r"^site-add-top-operation/(?P<pks>\d+)?/$",
- check_rights(["change_operation"])(
+ check_permissions(["archaeological_operations.change_operation"])(
views.site_add_top_operation
),
name="site-add-top-operation",