Skip to content

Commit 822b7bc

Browse files
[Fixes #12713] Usage of permissions registry, fix tests
1 parent 9c0b0e7 commit 822b7bc

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

geonode/security/tests.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2427,7 +2427,7 @@ def setUp(self):
24272427
assign_perm(perm, self.member_with_perms, self.resource.get_self_resource())
24282428

24292429
# Assert inital assignment of permissions to groups and users
2430-
resource_perm_specs = self.permissions_registry.get_perms(instance=self.resource, include_virtual=True)
2430+
resource_perm_specs = permissions_registry.get_perms(instance=self.resource, include_virtual=True)
24312431
self.assertSetEqual(
24322432
set(resource_perm_specs["users"][self.author]), set(self.owner_perms + self.edit_perms + self.dataset_perms)
24332433
)
@@ -2476,7 +2476,7 @@ def test_owner_is_group_manager(self):
24762476
# Admin publishes and approves the resource
24772477
response = self.admin_approve_and_publish_resource()
24782478
self.assertEqual(response.status_code, 200)
2479-
resource_perm_specs = self.permissions_registry.get_perms(instance=self.resource, include_virtual=True)
2479+
resource_perm_specs = permissions_registry.get_perms(instance=self.resource, include_virtual=True)
24802480

24812481
# Once a resource has been published, the 'publish_resourcebase' permission should be removed anyway
24822482
self.assertSetEqual(
@@ -2487,7 +2487,7 @@ def test_owner_is_group_manager(self):
24872487
# Admin un-approves and un-publishes the resource
24882488
response = self.admin_unapprove_and_unpublish_resource()
24892489
self.assertEqual(response.status_code, 200)
2490-
resource_perm_specs = self.permissions_registry.get_perms(instance=self.resource, include_virtual=True)
2490+
resource_perm_specs = permissions_registry.get_perms(instance=self.resource, include_virtual=True)
24912491

24922492
self.assertSetEqual(
24932493
set(resource_perm_specs["users"][self.author]),
@@ -2497,7 +2497,7 @@ def test_owner_is_group_manager(self):
24972497
GroupMember.objects.get(group=self.owner_group, user=self.author).demote()
24982498

24992499
def assertions_for_approved_or_published_is_true(self):
2500-
resource_perm_specs = self.permissions_registry.get_perms(instance=self.resource, include_virtual=True)
2500+
resource_perm_specs = permissions_registry.get_perms(instance=self.resource, include_virtual=True)
25012501
self.assertSetEqual(set(resource_perm_specs["users"][self.author]), set(self.owner_perms))
25022502
self.assertSetEqual(
25032503
set(resource_perm_specs["users"][self.member_with_perms]), set(self.owner_perms + self.dataset_perms)
@@ -2514,7 +2514,7 @@ def assertions_for_approved_or_published_is_true(self):
25142514
self.assertSetEqual(set(resource_perm_specs["groups"][self.resource_group.group]), set(self.safe_perms))
25152515

25162516
def assertions_for_approved_and_published_is_false(self):
2517-
resource_perm_specs = self.permissions_registry.get_perms(instance=self.resource, include_virtual=True)
2517+
resource_perm_specs = permissions_registry.get_perms(instance=self.resource, include_virtual=True)
25182518
self.assertSetEqual(
25192519
set(resource_perm_specs["users"][self.author]), set(self.owner_perms + self.edit_perms + self.dataset_perms)
25202520
)

geonode/security/utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,7 @@ def set_group_member_permissions(user, group, role):
693693
to the resource
694694
"""
695695
from geonode.security.registry import permissions_registry
696+
696697
# Fetching all the resources belonging to Group "group"; i.e. assgined to "group" metadata
697698
queryset = get_objects_for_user(
698699
user, ["base.view_resourcebase", "base.change_resourcebase"], any_perm=True

0 commit comments

Comments
 (0)