Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Small changes to permission checks

Roland Geider726972f8ab55
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.html
index 9f44ff0fe..dad86f1b0 100644
--- a/wger/core/templates/user/overview.html
+++ b/wger/core/templates/user/overview.html
@@ -203,7 +203,7 @@
-{% if perms.gym.manage_gyms %}
+{% if perms.gym.manage_gyms or perms.gym.manage_gym %}
<div class="btn-group pull-right">
<button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
{% trans "Actions" %} <span class="caret"></span>
diff --git a/wger/core/tests/test_user.py b/wger/core/tests/test_user.py
index 12b7cdf19..7f342623f 100644
--- a/wger/core/tests/test_user.py
+++ b/wger/core/tests/test_user.py
@@ -133,7 +133,7 @@ class StatusUserTestCase(WorkoutManagerTestCase):
class EditUserTestCase(WorkoutManagerEditTestCase):
'''
- Tests editing a user by an admin
+ Test editing a user
'''
object_class = User
@@ -141,7 +141,7 @@ class EditUserTestCase(WorkoutManagerEditTestCase):
pk = 2
data = {'email': '[email protected]',
'first_name': 'Name',
- 'last_name': 'Lastname'}
+ 'last_name': 'Last name'}
user_success = ('admin',
'general_manager1',
'general_manager2',
@@ -155,6 +155,28 @@ class EditUserTestCase(WorkoutManagerEditTestCase):
'trainer4')
+class EditUserTestCase2(WorkoutManagerEditTestCase):
+ '''
+ Test editing a user
+ '''
+
+ object_class = User
+ url = 'core:user:edit'
+ pk = 19
+ data = {'email': '[email protected]',
+ 'first_name': 'Name',
+ 'last_name': 'Last name'}
+ user_success = ('admin',
+ 'general_manager1',
+ 'general_manager2',
+ 'manager3')
+ user_fail = ('member1',
+ 'member2',
+ 'trainer2',
+ 'trainer3',
+ 'trainer4')
+
+
class UserListTestCase(WorkoutManagerAccessTestCase):
'''
Test accessing the general user overview
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index 230b7fa4f..f169ce95e 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -376,13 +376,17 @@ class UserEditView(WgerFormMixin, UpdateView):
def dispatch(self, request, *args, **kwargs):
'''
- Only managers and trainers for this gym can access the members
+ Check permissions
+
+ - Managers can edit members of their own gym
+ - General managers can edit every member
'''
user = request.user
if not user.is_authenticated():
return HttpResponseForbidden()
- if (user.has_perm('gym.manage_gym') or user.has_perm('gym.gym_trainer')) \
+ if user.has_perm('gym.manage_gym') \
+ and not user.has_perm('gym.manage_gyms') \
and user.userprofile.gym != self.get_object().userprofile.gym:
return HttpResponseForbidden()