summaryrefslogtreecommitdiff
path: root/archaeological_operations
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2024-11-14 17:51:18 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2025-02-19 14:45:55 +0100
commit39ee687bfa6709b23ae969700230cc40adbd718c (patch)
treeb24929876d8f4a39c9b39bfcc30be78ad225ae25 /archaeological_operations
parent56beeee5f8be48cc513e28721e9c17aa75fdd793 (diff)
downloadIshtar-39ee687bfa6709b23ae969700230cc40adbd718c.tar.bz2
Ishtar-39ee687bfa6709b23ae969700230cc40adbd718c.zip
🗃️ rename permission request fields to permission queries
Diffstat (limited to 'archaeological_operations')
-rw-r--r--archaeological_operations/tests.py34
1 files changed, 17 insertions, 17 deletions
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index e0c5df3ef..e46c79ee6 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -69,7 +69,7 @@ from ishtar_common.models import (
Town,
ImporterColumn,
ImportColumnValue,
- PermissionRequest,
+ PermissionQuery,
Person,
DocumentTemplate,
PersonType,
@@ -3484,28 +3484,28 @@ class OperationSearchTest(TestCase, OperationInitTest, SearchText):
self.assertEqual(values["data"], expected_result)
-class TestPermissionRequest:
- def setup_permission_requests(self, prefix, model_name, permissions,
+class TestPermissionQuery:
+ def setup_permission_queries(self, prefix, model_name, permissions,
perm_requests=None, create_profiles=True):
content_type = ContentType.objects.get(model=model_name)
- if not hasattr(self, "permission_requests"):
- self.permission_requests = {}
- self.permission_requests.update({
- f"{prefix}_associated_items": PermissionRequest.objects.create(
+ if not hasattr(self, "permission_queries"):
+ self.permission_queries = {}
+ self.permission_queries.update({
+ f"{prefix}_associated_items": PermissionQuery.objects.create(
model=content_type,
request="",
include_associated_items=True,
include_upstream_items=False,
slug=f'{prefix}-associated_items'
),
- f"{prefix}_upstream": PermissionRequest.objects.create(
+ f"{prefix}_upstream": PermissionQuery.objects.create(
model=content_type,
request="",
include_associated_items=False,
include_upstream_items=True,
slug=f"{prefix}-upstream"
),
- f"{prefix}_areas": PermissionRequest.objects.create(
+ f"{prefix}_areas": PermissionQuery.objects.create(
model=content_type,
request="",
include_associated_items=False,
@@ -3516,15 +3516,15 @@ class TestPermissionRequest:
})
if perm_requests:
for idx, request in enumerate(perm_requests):
- pr = PermissionRequest.objects.create(
+ pr = PermissionQuery.objects.create(
model=content_type,
request=request,
include_associated_items=False,
include_upstream_items=False,
slug=f"{prefix}-req-{idx+1}"
)
- self.permission_requests[f"{prefix}_request_{idx + 1}"] = pr
- pr = PermissionRequest.objects.create(
+ self.permission_queries[f"{prefix}_request_{idx + 1}"] = pr
+ pr = PermissionQuery.objects.create(
model=content_type,
request=request,
include_associated_items=False,
@@ -3532,7 +3532,7 @@ class TestPermissionRequest:
limit_to_attached_areas=True,
slug=f"{prefix}-req-areas-{idx+1}"
)
- self.permission_requests[f"{prefix}_request_areas_{idx + 1}"] = pr
+ self.permission_queries[f"{prefix}_request_areas_{idx + 1}"] = pr
gp = Group.objects.create(name=f"{prefix}_xxx")
for permission in permissions:
for p in Permission.objects.filter(codename=permission).all():
@@ -3541,13 +3541,13 @@ class TestPermissionRequest:
return
if not hasattr(self, "profile_types"):
self.profile_types = {}
- for key in self.permission_requests.keys():
+ for key in self.permission_queries.keys():
profile_type = ProfileType.objects.create(
label=key,
txt_idx=key,
)
profile_type.groups.add(gp)
- profile_type.permission_requests.add(self.permission_requests[key])
+ profile_type.permission_queries.add(self.permission_queries[key])
self.profile_types[key] = profile_type
def _test_search(self, url, label, user, expected):
@@ -3734,13 +3734,13 @@ class OperationOldPermissionTest(TestCase, OperationInitTest):
self.assertRedirects(response, "/")
-class OperationPermissionTest(TestCase, TestPermissionRequest, OperationInitTest):
+class OperationPermissionTest(TestCase, TestPermissionQuery, OperationInitTest):
fixtures = FILE_FIXTURES
def setUp(self):
IshtarSiteProfile.objects.get_or_create(slug="default", active=True)
- self.setup_permission_requests(
+ self.setup_permission_queries(
"ope",
"operation",
permissions=["view_own_operation", "change_own_operation"],