Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Changing a role doesn't work

Peter van der Doesdc230840611a
diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.py
index 7866cd7ed..e747d5121 100644
--- a/wger/gym/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -76,7 +76,6 @@ from wger.utils.generic_views import (
)
from wger.utils.helpers import password_generator
-
logger = logging.getLogger(__name__)
@@ -111,7 +110,7 @@ class GymUserListView(LoginRequiredMixin, WgerMultiplePermissionRequiredMixin, L
'''
if request.user.has_perm('gym.manage_gyms') \
or ((request.user.has_perm('gym.manage_gym')
- or request.user.has_perm('gym.gym_trainer'))
+ or request.user.has_perm('gym.gym_trainer'))
and request.user.userprofile.gym_id == int(self.kwargs['pk'])):
return super(GymUserListView, self).dispatch(request, *args, **kwargs)
return HttpResponseForbidden()
@@ -267,8 +266,8 @@ def gym_permissions_user_edit(request, user_pk):
form_group_permission = get_permission_list(user)
if request.method == 'POST':
- form = GymUserPermisssionForm(request.POST,
- available_roles=form_group_permission)
+ form = GymUserPermisssionForm(available_roles=form_group_permission,
+ data=request.POST)
if form.is_valid():
@@ -434,7 +433,7 @@ class GymUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin,
if not request.user.is_authenticated():
return HttpResponseForbidden()
- if request.user.has_perm('gym.manage_gym')\
+ if request.user.has_perm('gym.manage_gym') \
and not request.user.has_perm('gym.manage_gyms'):
if request.user.userprofile.gym_id != int(self.kwargs['pk']):
return HttpResponseForbidden()