Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Allow general managers to access user page

Roland Geidercc60821ea44e
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index 8a1b3c133..4ad03d267 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -417,7 +417,7 @@ class UserDetailView(WgerPermissionMixin, DetailView):
User overview for gyms
'''
model = User
- permission_required = ('gym.manage_gym', 'gym.gym_trainer')
+ permission_required = ('gym.manage_gym', 'gym.manage_gyms', 'gym.gym_trainer')
template_name = 'user/overview.html'
context_object_name = 'current_user'
@@ -426,11 +426,16 @@ class UserDetailView(WgerPermissionMixin, DetailView):
Only managers for this gym can access the members
'''
user = request.user
- if user.is_authenticated() and user.userprofile.gym == self.get_object().userprofile.gym:
- return super(UserDetailView, self).dispatch(request, *args, **kwargs)
- else:
+
+ if not user.is_authenticated():
return HttpResponseForbidden()
+ if (user.has_perm('gym.manage_gym') or user.has_perm('gym.gym_trainer')) \
+ and user.userprofile.gym != self.get_object().userprofile.gym:
+ return HttpResponseForbidden()
+
+ return super(UserDetailView, self).dispatch(request, *args, **kwargs)
+
def get_context_data(self, **kwargs):
'''
Send some additional data to the template