Skip to content

Commit 4064ce1

Browse files
committed
[docs] Made fixes suggested by @coderabbitai
1 parent cd8d998 commit 4064ce1

2 files changed

Lines changed: 18 additions & 3 deletions

File tree

openwisp_radius/api/views.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -963,8 +963,18 @@ class BaseRadiusUserGroupView(ProtectedAPIMixin, FilterByParentManaged):
963963
def get_queryset(self):
964964
if getattr(self, "swagger_fake_view", False):
965965
return self.queryset.none()
966-
qs = super().get_queryset()
967-
return qs.filter(user_id=self.kwargs["user_pk"])
966+
qs = (
967+
super()
968+
.get_queryset()
969+
.filter(
970+
user_id=self.kwargs["user_pk"],
971+
)
972+
)
973+
if self.request.user.is_superuser:
974+
return qs
975+
return qs.filter(
976+
group__organization__in=self.request.user.organizations_managed
977+
)
968978

969979
def get_parent_queryset(self):
970980
"""Get the parent user from the URL."""

openwisp_radius/tests/test_api/test_api.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1308,6 +1308,8 @@ def test_radius_user_group_list(self):
13081308
rug = self._create_radius_usergroup(
13091309
user=target_user, group=org1_group, priority=1
13101310
)
1311+
org2_group = RadiusGroup.objects.get(organization=org2, name="org-2-users")
1312+
self._create_radius_usergroup(user=target_user, group=org2_group, priority=1)
13111313
url = reverse("radius:radius_user_group_list", args=[target_user.pk])
13121314
org2_user_url = reverse("radius:radius_user_group_list", args=[org2_user.pk])
13131315

@@ -1353,7 +1355,10 @@ def test_radius_user_group_list(self):
13531355
)
13541356
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
13551357
self.assertEqual(
1356-
RadiusUserGroup.objects.filter(user=target_user).count(), 2
1358+
RadiusUserGroup.objects.filter(
1359+
user=target_user, group__organization=org1
1360+
).count(),
1361+
2,
13571362
)
13581363

13591364
with self.subTest("Cannot access user from other organization"):

0 commit comments

Comments
 (0)