summaryrefslogtreecommitdiff
path: root/ishtar_common/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common/urls.py')
-rw-r--r--ishtar_common/urls.py256
1 files changed, 152 insertions, 104 deletions
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py
index a205e3b01..8bb8dd356 100644
--- a/ishtar_common/urls.py
+++ b/ishtar_common/urls.py
@@ -26,9 +26,9 @@ from django.views.generic import TemplateView
from .menus import Menu
from ishtar_common import views, models, views_item
-from ishtar_common.utils import check_rights, get_urls_for_model
+from ishtar_common.utils import check_permissions, get_urls_for_model
-# be careful: each check_rights must be relevant with ishtar_menu
+# be careful: each check_permissions must be relevant with ishtar_menu
# forms
urlpatterns = [
@@ -69,72 +69,76 @@ urlpatterns = [
),
url(
r"person_search/(?P<step>.+)?$",
- check_rights(["add_person"])(views.person_search_wizard),
+ check_permissions(["ishtar_common.add_person"])(views.person_search_wizard),
name="person_search",
),
url(
r"person_creation/(?P<step>.+)?$",
- check_rights(["add_person"])(views.person_creation_wizard),
+ check_permissions(["ishtar_common.add_person"])(views.person_creation_wizard),
name="person_creation",
),
url(
r"person_modification/(?P<step>.+)?$",
- check_rights(["change_person", "change_own_person"])(
- views.person_modification_wizard
- ),
+ 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(
r"person_deletion/(?P<step>.+)?$",
- check_rights(["change_person", "change_own_person"])(
- views.person_deletion_wizard
- ),
+ check_permissions(
+ ["ishtar_common.change_person", "ishtar_common.change_own_person"]
+ )(views.person_deletion_wizard),
name="person_deletion",
),
url(r"person_delete/(?P<pk>.+)/$", views.person_delete, name="person_delete"),
url(
r"^person-edit/$",
- check_rights(["add_person"])(views.PersonCreate.as_view()),
+ check_permissions(["ishtar_common.add_person"])(views.PersonCreate.as_view()),
name="person_create",
),
url(
r"^person-edit/(?P<pk>\d+)$",
- check_rights(["change_person", "change_own_person"])(
- views.PersonEdit.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.change_person", "ishtar_common.change_own_person"]
+ )(views.PersonEdit.as_view()),
name="person_edit",
),
url(
r"^person-qa-bulk-update/(?P<pks>[0-9-]+)?/$",
- check_rights(["change_person", "change_own_person"])(
- views.QAPersonForm.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.change_person", "ishtar_common.change_own_person"]
+ )(views.QAPersonForm.as_view()),
name="person-qa-bulk-update",
),
url(
r"^person-qa-bulk-update/(?P<pks>[0-9-]+)?/confirm/$",
- check_rights(["change_person", "change_own_person"])(
- views.QAPersonForm.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.change_person", "ishtar_common.change_own_person"]
+ )(views.QAPersonForm.as_view()),
name="person-qa-bulk-update-confirm",
kwargs={"confirm": True},
),
url(
r"organization_search/(?P<step>.+)?$",
- check_rights(["add_organization"])(views.organization_search_wizard),
+ check_permissions(
+ ["ishtar_common.add_organization"]
+ )(views.organization_search_wizard),
name="organization_search",
),
url(
r"organization_creation/(?P<step>.+)?$",
- check_rights(["add_organization"])(views.organization_creation_wizard),
+ check_permissions(
+ ["ishtar_common.add_organization"]
+ )(views.organization_creation_wizard),
name="organization_creation",
),
url(
r"organization_modification/(?P<step>.+)?$",
- check_rights(["change_organization", "change_own_organization"])(
- views.organization_modification_wizard
- ),
+ check_permissions(
+ ["ishtar_common.change_organization", "ishtar_common.change_own_organization"]
+ )(views.organization_modification_wizard),
name="organization_modification",
),
url(
@@ -144,9 +148,9 @@ urlpatterns = [
),
url(
r"organization_deletion/(?P<step>.+)?$",
- check_rights(["change_organization", "change_own_organization"])(
- views.organization_deletion_wizard
- ),
+ check_permissions(
+ ["ishtar_common.change_organization", "ishtar_common.change_own_organization"]
+ )(views.organization_deletion_wizard),
name="organization_deletion",
),
url(
@@ -156,47 +160,54 @@ urlpatterns = [
),
url(
r"organization-edit/$",
- check_rights(["add_organization"])(views.OrganizationCreate.as_view()),
+ check_permissions(
+ ["ishtar_common.add_organization"]
+ )(views.OrganizationCreate.as_view()),
name="organization_create",
),
url(
r"organization-edit/(?P<pk>\d+)$",
- check_rights(["change_organization", "change_own_organization"])(
- views.OrganizationEdit.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.change_organization",
+ "ishtar_common.change_own_organization"]
+ )(views.OrganizationEdit.as_view()),
name="organization_edit",
),
url(
r"organization-person-edit/$",
- check_rights(["add_organization"])(views.OrganizationPersonCreate.as_view()),
+ check_permissions(
+ ["ishtar_common.add_organization"]
+ )(views.OrganizationPersonCreate.as_view()),
name="organization_person_create",
),
url(
r"organization-person-edit/(?P<pk>\d+)$",
- check_rights(["change_organization", "change_own_organization"])(
- views.OrganizationPersonEdit.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.change_organization", "ishtar_common.change_own_organization"]
+ )(views.OrganizationPersonEdit.as_view()),
name="organization_person_edit",
),
url(
r"^organization-qa-bulk-update/(?P<pks>[0-9-]+)?/$",
- check_rights(["change_organization", "change_own_organization"])(
- views.QAOrganizationForm.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.change_organization", "ishtar_common.change_own_organization"]
+ )(views.QAOrganizationForm.as_view()),
name="organization-qa-bulk-update",
),
url(
r"^organization-qa-bulk-update/(?P<pks>[0-9-]+)?/confirm/$",
- check_rights(["change_organization", "change_own_organization"])(
- views.QAOrganizationForm.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.change_organization", "ishtar_common.change_own_organization"]
+ )(views.QAOrganizationForm.as_view()),
name="organization-qa-bulk-update-confirm",
kwargs={"confirm": True},
),
url(r"get-ishtaruser/(?P<type>.+)?$", views.get_ishtaruser, name="get-ishtaruser"),
url(
r"account_management/(?P<step>.+)?$",
- check_rights(["add_ishtaruser"])(views.account_management_wizard),
+ check_permissions(
+ ["ishtar_common.add_ishtaruser"]
+ )(views.account_management_wizard),
name="account_management",
),
url(
@@ -206,67 +217,97 @@ urlpatterns = [
),
url(
r"account_deletion/(?P<step>.+)?$",
- check_rights(["add_ishtaruser"])(views.account_deletion_wizard),
+ check_permissions(
+ ["ishtar_common.add_ishtaruser"]
+ )(views.account_deletion_wizard),
name="account_deletion",
),
url(
r"^import-new/$",
- check_rights(["add_import", "add_own_import"])(views.NewImportView.as_view()),
+ check_permissions(
+ ["ishtar_common.add_import", "ishtar_common.add_own_import"]
+ )(views.NewImportView.as_view()),
name="new_import",
),
url(
r"^import-edit/(?P<pk>[0-9]+)/$",
- check_rights(["change_import", "change_own_import"])(views.EditImportView.as_view()),
+ check_permissions(
+ ["ishtar_common.change_import", "ishtar_common.change_own_import"]
+ )(views.EditImportView.as_view()),
name="edit_import",
),
url(
r"^import-new-gis/$",
- check_rights(["add_import", "add_own_import"])(views.NewImportGISView.as_view()),
+ check_permissions(
+ ["ishtar_common.add_import", "ishtar_common.add_own_import"]
+ )(views.NewImportGISView.as_view()),
name="new_import_gis",
),
url(
r"^import-new-group/$",
- check_rights(["add_import", "add_own_import"])(views.NewImportGroupView.as_view()),
+ check_permissions(
+ ["ishtar_common.add_import", "ishtar_common.add_own_import"]
+ )(views.NewImportGroupView.as_view()),
name="new_import_group",
),
url(
r"^import-list/$",
- check_rights(["view_import", "change_import", "change_own_import"])(views.ImportListView.as_view()),
+ check_permissions(
+ ["ishtar_common.view_import", "ishtar_common.change_import",
+ "ishtar_common.change_own_import"]
+ )(views.ImportListView.as_view()),
name="current_imports",
),
url(
r"^import-list-table/$",
- check_rights(["view_import", "change_import", "change_own_import"])(views.ImportListTableView.as_view()),
+ check_permissions(
+ ["ishtar_common.view_import", "ishtar_common.change_import",
+ "ishtar_common.change_own_import"]
+ )(views.ImportListTableView.as_view()),
name="current_imports_table",
),
url(
r"^import-get-status/$",
- check_rights(["view_import", "change_import", "change_own_import"])(views.import_get_status),
- name="import_get_status",
+ check_permissions(
+ ["ishtar_common.view_import", "ishtar_common.change_import",
+ "ishtar_common.change_own_import"]
+ )(views.import_get_status),
+ name="import_get_status",
),
url(
r"^import-list-old/$",
- check_rights(["view_import", "change_import", "change_own_import"])(views.ImportOldListView.as_view()),
+ check_permissions(
+ ["ishtar_common.view_import", "ishtar_common.change_import",
+ "ishtar_common.change_own_import"]
+ )(views.ImportOldListView.as_view()),
name="old_imports",
),
url(
r"^import-delete/(?P<pk>[0-9]+)/$",
- check_rights(["delete_import", "delete_own_import"])(views.ImportDeleteView.as_view()),
+ check_permissions(
+ ["ishtar_common.delete_import", "ishtar_common.delete_own_import"]
+ )(views.ImportDeleteView.as_view()),
name="import_delete",
),
url(
r"^import-group-delete/(?P<pk>[0-9]+)/$",
- check_rights(["delete_import", "delete_own_import"])(views.ImportGroupDeleteView.as_view()),
+ check_permissions(
+ ["ishtar_common.delete_import", "ishtar_common.delete_own_import"]
+ )(views.ImportGroupDeleteView.as_view()),
name="import_group_delete",
),
url(
r"^import-link-unmatched/(?P<pk>[0-9]+)/$",
- check_rights(["change_import", "change_own_import"])(views.ImportMatchView.as_view()),
+ check_permissions(
+ ["ishtar_common.change_import", "ishtar_common.change_own_import"]
+ )(views.ImportMatchView.as_view()),
name="import_link_unmatched",
),
url(
r"^import-csv-view/(?P<target>source|result|match|error)/(?P<group>group\-)?(?P<pk>[0-9]+)/$",
- check_rights(["view_import", "view_own_import"])(views.ImportCSVView.as_view()),
+ check_permissions(
+ ["ishtar_common.view_import", "ishtar_common.view_own_import"]
+ )(views.ImportCSVView.as_view()),
name="import_display_csv",
),
url(
@@ -282,12 +323,16 @@ urlpatterns = [
),
url(
r"^import-pre-form/(?P<import_id>[0-9]+)/$",
- check_rights(["change_import", "change_own_import"])(views.ImportPreFormView.as_view()),
+ check_permissions(
+ ["ishtar_common.change_import", "ishtar_common.change_own_import"]
+ )(views.ImportPreFormView.as_view()),
name="import_pre_import_form",
),
url(
r"^import-ignore-line/(?P<line_id>[0-9]+)/$",
- check_rights(["change_import", "change_own_import"])(views.line_error),
+ 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"),
@@ -417,9 +462,10 @@ urlpatterns += [
),
url(
r"^biographicalnote-qa-edit/(?P<pks>[0-9-]+)?/$",
- check_rights(["change_biographicalnote", "change_own_biographicalnote"])(
- views.QABiographicalNoteForm.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.change_biographicalnote",
+ "ishtar_common.change_own_biographicalnote"]
+ )(views.QABiographicalNoteForm.as_view()),
name="biographicalnote-qa-edit",
),
url(
@@ -551,44 +597,44 @@ urlpatterns += [
),
url(
r"document/search/(?P<step>.+)?$",
- check_rights(["view_document", "view_own_document"])(
- views.document_search_wizard
- ),
+ check_permissions(
+ ["ishtar_common.view_document", "ishtar_common.view_own_document"]
+ )(views.document_search_wizard),
name="search-document",
),
url(
r"document/search/(?P<step>.+)?$",
- check_rights(["view_document", "view_own_document"])(
- views.document_search_wizard
- ),
+ check_permissions(
+ ["ishtar_common.view_document", "ishtar_common.view_own_document"]
+ )(views.document_search_wizard),
name="document_search",
),
url(
r"document/create/$",
- check_rights(["add_document", "add_own_document"])(
- views.DocumentCreateView.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.add_document", "ishtar_common.add_own_document"]
+ )(views.DocumentCreateView.as_view()),
name="create-document",
),
url(
r"document/edit/$",
- check_rights(["change_document", "change_own_document"])(
- views.DocumentSelectView.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.change_document", "ishtar_common.change_own_document"]
+ )(views.DocumentSelectView.as_view()),
name="edit-document",
),
url(
r"document/edit/(?P<pk>.+)/$",
- check_rights(["change_document", "change_own_document"])(
- views.DocumentEditView.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.change_document", "ishtar_common.change_own_document"]
+ )(views.DocumentEditView.as_view()),
name="edit-document",
),
url(
r"document/delete/(?P<step>.+)?$",
- check_rights(["change_document", "change_own_document"])(
- views.document_deletion_wizard
- ),
+ check_permissions(
+ ["ishtar_common.change_document", "ishtar_common.change_own_document"]
+ )(views.document_deletion_wizard),
name="document_deletion",
),
url(
@@ -603,31 +649,31 @@ urlpatterns += [
),
url(
r"^document-qa-bulk-update/(?P<pks>[0-9-]+)?/$",
- check_rights(["change_document", "change_own_document"])(
- views.QADocumentForm.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.change_document", "ishtar_common.change_own_document"]
+ )(views.QADocumentForm.as_view()),
name="document-qa-bulk-update",
),
url(
r"^document-qa-bulk-update/(?P<pks>[0-9-]+)?/confirm/$",
- check_rights(["change_document", "change_own_document"])(
- views.QADocumentForm.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.change_document", "ishtar_common.change_own_document"]
+ )(views.QADocumentForm.as_view()),
name="document-qa-bulk-update-confirm",
kwargs={"confirm": True},
),
url(
r"^document-qa-duplicate/(?P<pks>[0-9-]+)?/$",
- check_rights(["change_document", "change_own_document"])(
- views.QADocumentDuplicateFormView.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.change_document", "ishtar_common.change_own_document"]
+ )(views.QADocumentDuplicateFormView.as_view()),
name="document-qa-duplicate",
),
url(
r"^document-qa-packaging/(?P<pks>[0-9-]+)?/$",
- check_rights(["change_document", "change_own_document"])(
- views.QADocumentPackagingFormView.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.change_document", "ishtar_common.change_own_document"]
+ )(views.QADocumentPackagingFormView.as_view()),
name="document-qa-packaging",
),
url(
@@ -642,30 +688,32 @@ urlpatterns += [
),
url(
r"geo/create/(?P<app_source>[-\w]+)/(?P<model_source>[-\w]+)/(?P<source_pk>\d+)/$",
- check_rights(["add_geovectordata", "add_own_geovectordata"])(
- views.GeoPreCreateView.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.add_geovectordata", "ishtar_common.add_own_geovectordata"]
+ )(views.GeoPreCreateView.as_view()),
name="create-pre-geo",
),
url(
r"geo/create/(?P<app_source>[-\w]+)/(?P<model_source>[-\w]+)/(?P<source_pk>\d+)/(?P<geom_type>[-\w]+)/$",
- check_rights(["add_geovectordata", "add_own_geovectordata"])(
- views.GeoCreateView.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.add_geovectordata", "ishtar_common.add_own_geovectordata"]
+ )(views.GeoCreateView.as_view()),
name="create-geo",
),
url(
r"geo/edit/(?P<pk>\d+)/$",
- check_rights(["change_geovectordata", "change_own_geovectordata"])(
- views.GeoEditView.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.change_geovectordata",
+ "ishtar_common.change_own_geovectordata"]
+ )(views.GeoEditView.as_view()),
name="edit-geo",
),
url(
r"geo/delete/(?P<pk>\d+)/$",
- check_rights(["change_geovectordata", "change_own_geovectordata"])(
- views.GeoDeleteView.as_view()
- ),
+ check_permissions(
+ ["ishtar_common.change_geovectordata",
+ "ishtar_common.change_own_geovectordata"]
+ )(views.GeoDeleteView.as_view()),
name="delete-geo",
),
url(