|
51 | 51 | )
|
52 | 52 | from .persistence import (
|
53 | 53 | delete_scene_objects,
|
| 54 | + get_persist_ns_all, |
54 | 55 | get_persist_scenes_all,
|
55 | 56 | get_persist_scenes_ns,
|
56 | 57 | get_scene_objects,
|
@@ -210,7 +211,7 @@ def namespace_perm_detail(request, pk):
|
210 | 211 | version = TOPIC_SUPPORTED_API_VERSIONS[0] # TODO (mwfarb): resolve missing request.version
|
211 | 212 |
|
212 | 213 | if not namespace_edit_permission(user=request.user, namespace=pk):
|
213 |
| - messages.error(request, f"User does not have permission for: {pk}.") |
| 214 | + messages.error(request, f"User does not have edit permission for namespace: {pk}.") |
214 | 215 | return redirect("users:user_profile")
|
215 | 216 | owners = []
|
216 | 217 | if User.objects.filter(username=pk).exists():
|
@@ -250,7 +251,7 @@ def scene_perm_detail(request, pk):
|
250 | 251 | version = TOPIC_SUPPORTED_API_VERSIONS[0] # TODO (mwfarb): resolve missing request.version
|
251 | 252 |
|
252 | 253 | if not scene_edit_permission(user=request.user, scene=pk):
|
253 |
| - messages.error(request, f"User does not have permission for: {pk}.") |
| 254 | + messages.error(request, f"User does not have edit permission for scene: {pk}.") |
254 | 255 | return redirect("users:user_profile")
|
255 | 256 | owners = [pk.split("/")[0]]
|
256 | 257 | namespace_editors = [] # TODO: define namespaced_editors
|
@@ -318,7 +319,7 @@ def device_perm_detail(request, pk):
|
318 | 319 | version = TOPIC_SUPPORTED_API_VERSIONS[0] # TODO (mwfarb): resolve missing request.version
|
319 | 320 |
|
320 | 321 | if not device_edit_permission(user=request.user, device=pk):
|
321 |
| - messages.error(request, f"User does not have permission for: {pk}.") |
| 322 | + messages.error(request, f"User does not have edit permission for device: {pk}.") |
322 | 323 | return redirect("users:user_profile")
|
323 | 324 | # now, make sure device exists before the other commands are tried
|
324 | 325 | try:
|
@@ -378,7 +379,7 @@ def scene_detail(request, pk):
|
378 | 379 | # check permissions model for namespace
|
379 | 380 | if not scene_edit_permission(user=request.user, scene=pk):
|
380 | 381 | return JsonResponse(
|
381 |
| - {"error": f"User does not have permission for: {pk}."}, |
| 382 | + {"error": f"User does not have edit permission for scene: {pk}."}, |
382 | 383 | status=status.HTTP_400_BAD_REQUEST,
|
383 | 384 | )
|
384 | 385 |
|
@@ -555,9 +556,8 @@ def get_my_edit_namespaces(user, version):
|
555 | 556 | # for staff, add any non-user namespaces in persist db
|
556 | 557 | if user.is_staff: # admin/staff
|
557 | 558 | token = all_scenes_read_token(version)
|
558 |
| - p_scenes = get_persist_scenes_all(token) |
559 |
| - for p_scene in p_scenes: |
560 |
| - p_ns = p_scene.split("/")[0] # TODO: replace with distinct call persist/!allnamespaces |
| 559 | + p_nss = get_persist_ns_all(token) |
| 560 | + for p_ns in p_nss: |
561 | 561 | if not any(dictionary.get("name") == p_ns for dictionary in ns_out):
|
562 | 562 | if not User.objects.filter(username=p_ns).exists():
|
563 | 563 | ns_out.append(vars(NamespaceDefault(name=p_ns)))
|
|
0 commit comments