switch space method signature change and test

This commit is contained in:
vabene1111
2022-06-09 18:18:57 +02:00
parent 2ab1560aed
commit 30e4ee855c
4 changed files with 63 additions and 16 deletions

View File

@@ -1189,9 +1189,12 @@ def switch_active_space(request, space_id):
api endpoint to switch space function
"""
try:
user_space = get_object_or_404(UserSpace, space=space_id, user=request.user)
switch_user_active_space(request.user, user_space)
return Response(UserSpaceSerializer().to_representation(instance=user_space), status=status.HTTP_200_OK)
space = get_object_or_404(Space, id=space_id)
user_space = switch_user_active_space(request.user, space)
if user_space:
return Response(UserSpaceSerializer().to_representation(instance=user_space), status=status.HTTP_200_OK)
else:
return Response("not found", status=status.HTTP_404_NOT_FOUND)
except Exception as e:
traceback.print_exc()
return Response(str(e), status=status.HTTP_400_BAD_REQUEST)

View File

@@ -142,8 +142,8 @@ def space_overview(request):
@login_required
def switch_space(request, space_id):
user_space = get_object_or_404(UserSpace, space=space_id, user=request.user)
switch_user_active_space(request.user, user_space)
space = get_object_or_404(Space, id=space_id)
switch_user_active_space(request.user, space)
return HttpResponseRedirect(reverse('index'))
@@ -519,8 +519,8 @@ def invite_link(request, token):
@group_required('admin')
def space_manage(request, space_id):
user_space = get_object_or_404(UserSpace, space=space_id, user=request.user)
switch_user_active_space(request.user, user_space)
space = get_object_or_404(Space, id=space_id)
switch_user_active_space(request.user, space)
return render(request, 'space_manage.html', {})