Self hosted FLOSS fitness/workout, nutrition and weight tracker
Allow general managers to edit users
Roland Geidera91e4ef2f063
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.htmlindex eafbbc32e..43ea86a5e 100644--- a/wger/core/templates/user/overview.html+++ b/wger/core/templates/user/overview.html@@ -18,6 +18,7 @@{% block content %}{% url 'core:user:trainer-login' current_user.pk as trainer_login %}+{% if not perms.gym.manage_gyms %}<h4>{% trans "Workouts" %} <small>({% blocktrans with number=10 %}last {{ number }}{% endblocktrans %})</small></h4>{% if perms.gym.gym_trainer %}@@ -187,6 +188,8 @@</tbody></table>++{% endif %}{% endblock %}@@ -198,7 +201,7 @@-{% if perms.gym.manage_gym %}+{% if perms.gym.manage_gyms %}<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>@@ -274,7 +277,7 @@<td>{% trans "Last login" %}</td><td>{{current_user.last_login}}</td></tr>-{% if perms.gym.manage_gym %}+{% if perms.gym.manage_gym or perms.gym.manage_gyms %}<tr {% if not current_user.is_active %}class="danger"{% endif%}><td>{% trans "Status" %}</td><td>diff --git a/wger/core/tests/test_delete_user.py b/wger/core/tests/test_delete_user.pyindex e90dc04ae..f6db78e88 100644--- a/wger/core/tests/test_delete_user.py+++ b/wger/core/tests/test_delete_user.py@@ -79,9 +79,11 @@ class DeleteUserByAdminTestCase(WorkoutManagerTestCase):response = self.client.get(reverse('core:user:delete', kwargs={'user_pk': 2}))self.assertEqual(User.objects.filter(username='test').count(), 1)if fail:- self.assertIn(response.status_code, (302, 403))+ self.assertIn(response.status_code, (302, 403),+ 'Unexpected status code for user {0}'.format(self.current_user))else:- self.assertEqual(response.status_code, 200)+ self.assertEqual(response.status_code, 200,+ 'Unexpected status code for user {0}'.format(self.current_user))# Wrong admin passwordif not fail:@@ -100,6 +102,34 @@ class DeleteUserByAdminTestCase(WorkoutManagerTestCase):self.assertEqual(response.status_code, 302)self.assertEqual(User.objects.filter(username='test').count(), 0)+ def test_delete_user_manager(self):+ '''+ Tests deleting the user account as a gym manager+ '''+ self.user_login('manager1')+ self.delete_user(fail=False)++ def test_delete_user_manager2(self):+ '''+ Tests deleting the user account as a gym manager+ '''+ self.user_login('manager2')+ self.delete_user(fail=False)++ def test_delete_user_general_manager(self):+ '''+ Tests deleting the user account as a general manager+ '''+ self.user_login('general_manager1')+ self.delete_user(fail=False)++ def test_delete_user_general_manager2(self):+ '''+ Tests deleting the user account as a general manager+ '''+ self.user_login('general_manager2')+ self.delete_user(fail=False)+def test_delete_user(self):'''Tests deleting the user account as a regular user@@ -114,18 +144,11 @@ class DeleteUserByAdminTestCase(WorkoutManagerTestCase):self.user_login('trainer1')self.delete_user(fail=True)- def test_delete_user_manager(self):- '''- Tests deleting the user account as a gym manager- '''- self.user_login('manager1')- self.delete_user(fail=False)-- def test_delete_user_general_manager(self):+ def test_delete_user_trainer2(self):'''- Tests deleting the user account as a gym general manager+ Tests deleting the user account as a gym trainer'''- self.user_login('general_manager1')+ self.user_login('trainer4')self.delete_user(fail=True)def test_delete_user_trainer_other(self):@@ -142,11 +165,18 @@ class DeleteUserByAdminTestCase(WorkoutManagerTestCase):self.user_login('manager3')self.delete_user(fail=True)- def test_delete_user_general_manager_other(self):+ def test_delete_user_member(self):'''- Tests deleting the user account as a gym general manager of another gym+ Tests deleting the user account as a gym member'''- self.user_login('general_manager2')+ self.user_login('member1')+ self.delete_user(fail=True)++ def test_delete_user_member(self):+ '''+ Tests deleting the user account as a gym member+ '''+ self.user_login('member4')self.delete_user(fail=True)def test_delete_user_anonymous(self):diff --git a/wger/core/tests/test_user.py b/wger/core/tests/test_user.pyindex 5bd746028..8c8d8191b 100644--- a/wger/core/tests/test_user.py+++ b/wger/core/tests/test_user.py@@ -24,9 +24,24 @@ from wger.manager.tests.testcase import (class StatusUserTestCase(WorkoutManagerTestCase):'''- Tests activating and deactivating users+ Test activating and deactivating users'''+ user_success = ('general_manager1',+ 'general_manager2',+ 'manager1',+ 'manager2',+ 'trainer1',+ 'trainer2',+ 'trainer3')++ user_fail = ('member1',+ 'member2',+ 'member3',+ 'member4',+ 'manager3',+ 'trainer4')+def activate(self, fail=False):'''Helper function to test activating users@@ -40,25 +55,31 @@ class StatusUserTestCase(WorkoutManagerTestCase):user = User.objects.get(pk=2)if fail:- self.assertEqual(response.status_code, 403)+ self.assertEqual(response.status_code, 403,+ 'Unexpected status code for user {0}'.format(self.current_user))self.assertFalse(user.is_active)else:- self.assertEqual(response.status_code, 302)+ self.assertEqual(response.status_code, 302,+ 'Unexpected status code for user {0}'.format(self.current_user))self.assertTrue(user.is_active)def test_activate_authorized(self):'''Tests activating a user as an administrator'''- self.user_login('admin')- self.activate()+ for username in self.user_success:+ self.user_login(username)+ self.activate()+ self.user_logout()def test_activate_unauthorized(self):'''Tests activating a user as another logged in user'''- self.user_login('demo')- self.activate(fail=True)+ for username in self.user_fail:+ self.user_login(username)+ self.activate(fail=True)+ self.user_logout()def test_activate_logged_out(self):'''@@ -71,6 +92,8 @@ class StatusUserTestCase(WorkoutManagerTestCase):Helper function to test deactivating users'''user = User.objects.get(pk=2)+ user.is_active = True+ user.save()self.assertTrue(user.is_active)response = self.client.get(reverse('core:user:deactivate', kwargs={'pk': user.pk}))@@ -87,15 +110,19 @@ class StatusUserTestCase(WorkoutManagerTestCase):'''Tests deactivating a user as an administrator'''- self.user_login('admin')- self.deactivate()+ for username in self.user_success:+ self.user_login(username)+ self.deactivate()+ self.user_logout()def test_deactivate_unauthorized(self):'''Tests deactivating a user as another logged in user'''- self.user_login('demo')- self.deactivate(fail=True)+ for username in self.user_fail:+ self.user_login(username)+ self.deactivate(fail=True)+ self.user_logout()def test_deactivate_logged_out(self):'''@@ -115,6 +142,17 @@ class EditUserTestCase(WorkoutManagerEditTestCase):data = {'email': '[email protected]','first_name': 'Name','last_name': 'Lastname'}+ user_success = ('admin',+ 'general_manager1',+ 'general_manager2',+ 'manager1',+ 'manager2')+ user_fail = ('member1',+ 'member2',+ 'manager3',+ 'trainer2',+ 'trainer3',+ 'trainer4')class UserListTestCase(WorkoutManagerAccessTestCase):diff --git a/wger/core/views/user.py b/wger/core/views/user.pyindex 4ad03d267..f0aabd7f9 100644--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@ -95,12 +95,13 @@ def delete(request, user_pk=None):form_action = reverse('core:user:delete', kwargs={'user_pk': user_pk})# Forbidden if the user has not enough rights, doesn't belong to the- # gym or is an admin as well- if (not request.user.has_perm('gym.manage_gym')- or request.user.userprofile.gym_id != user.userprofile.gym_id- or user.has_perm('gym.manage_gym')- or user.has_perm('gym.gym_trainer')- or user.has_perm('gym.manage_gyms')):+ # gym or is an admin as well. General admins can delete all users.+ if not request.user.has_perm('gym.manage_gyms') \+ and (not request.user.has_perm('gym.manage_gym')+ or request.user.userprofile.gym_id != user.userprofile.gym_id+ or user.has_perm('gym.manage_gym')+ or user.has_perm('gym.gym_trainer')+ or user.has_perm('gym.manage_gyms')):return HttpResponseForbidden()else:user = request.user@@ -306,17 +307,22 @@ class UserDeactivateView(WgerPermissionMixin, RedirectView):'''permanent = Falsemodel = User- permission_required = ('gym.manage_gym', 'gym.gym_trainer')+ permission_required = ('gym.manage_gym', 'gym.manage_gyms', 'gym.gym_trainer')def dispatch(self, request, *args, **kwargs):'''Only managers and trainers for this gym can access the members'''edit_user = get_object_or_404(User, pk=self.kwargs['pk'])- if (request.user.has_perm('gym.manage_gym') or request.user.has_perm('gym.gym_trainer')- and request.user.userprofile.gym_id == edit_user.userprofile.gym_id):- return super(UserDeactivateView, self).dispatch(request, *args, **kwargs)- return HttpResponseForbidden()++ if not request.user.is_authenticated():+ return HttpResponseForbidden()++ if (request.user.has_perm('gym.manage_gym') or request.user.has_perm('gym.gym_trainer')) \+ and edit_user.userprofile.gym_id != request.user.userprofile.gym_id:+ return HttpResponseForbidden()++ return super(UserDeactivateView, self).dispatch(request, *args, **kwargs)def get_redirect_url(self, pk):edit_user = get_object_or_404(User, pk=pk)@@ -332,17 +338,22 @@ class UserActivateView(WgerPermissionMixin, RedirectView):'''permanent = Falsemodel = User- permission_required = ('gym.manage_gym', 'gym.gym_trainer')+ permission_required = ('gym.manage_gym', 'gym.manage_gyms', 'gym.gym_trainer')def dispatch(self, request, *args, **kwargs):'''Only managers and trainers for this gym can access the members'''edit_user = get_object_or_404(User, pk=self.kwargs['pk'])- if (request.user.has_perm('gym.manage_gym') or request.user.has_perm('gym.gym_trainer')- and request.user.userprofile.gym_id == edit_user.userprofile.gym_id):- return super(UserActivateView, self).dispatch(request, *args, **kwargs)- return HttpResponseForbidden()++ if not request.user.is_authenticated():+ return HttpResponseForbidden()++ if (request.user.has_perm('gym.manage_gym') or request.user.has_perm('gym.gym_trainer')) \+ and edit_user.userprofile.gym_id != request.user.userprofile.gym_id:+ return HttpResponseForbidden()++ return super(UserActivateView, self).dispatch(request, *args, **kwargs)def get_redirect_url(self, pk):edit_user = get_object_or_404(User, pk=pk)@@ -359,19 +370,23 @@ class UserEditView(WgerFormMixin, UpdateView):model = Usertitle = ugettext_lazy('Edit user')- permission_required = 'gym.manage_gym'+ permission_required = ('gym.manage_gym', 'gym.manage_gyms')form_class = UserPersonalInformationFormdef dispatch(self, request, *args, **kwargs):'''Only managers and trainers for this gym can access the members'''- if request.user.is_authenticated() \- and request.user.userprofile.gym == self.get_object().userprofile.gym:- return super(UserEditView, self).dispatch(request, *args, **kwargs)- else:+ user = request.user+ 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(UserEditView, self).dispatch(request, *args, **kwargs)+def get_success_url(self):return reverse('core:user:overview', kwargs={'pk': self.kwargs['pk']})