Self hosted FLOSS fitness/workout, nutrition and weight tracker
Some work on permissions
Roland Geiderbcd17b10a46e
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.htmlindex e258b6633..053f8b675 100644--- a/wger/core/templates/user/overview.html+++ b/wger/core/templates/user/overview.html@@ -242,6 +242,7 @@{# #}{# Admin notes #}{# #}+{% if perms.gym.add_adminusernote %}<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>@@ -256,7 +257,6 @@</ul></div>-<h4>{% trans "Notes" %}</h4><table class="table">{% for note in admin_notes %}@@ -276,10 +276,12 @@</tr>{% endfor %}</table>+{% endif %}{# #}{# Gym configuration #}{# #}+{% if perms.gym.change_gymuserconfig %}<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>@@ -291,7 +293,7 @@</li></ul></div>-+{% endif %}<h4>{% trans "Configuration" %}</h4><table class="table">diff --git a/wger/gym/templates/admin_notes/list.html b/wger/gym/templates/admin_notes/list.htmlindex 449f16be9..22d3ca39a 100644--- a/wger/gym/templates/admin_notes/list.html+++ b/wger/gym/templates/admin_notes/list.html@@ -12,14 +12,18 @@{% for note in adminusernote_list %}<li class="list-group-item "><div class="pull-right">+ {% if perms.gym.delete_adminusernote %}<a href="{% url 'gym:admin_note:delete' note.pk %}"class="btn btn-danger btn-xs wger-modal-dialog">{% trans 'Delete' %}</a>+ {% endif %}+ {% if perms.gym.change_adminusernote %}<a href="{% url 'gym:admin_note:edit' note.pk %}"class="btn btn-default btn-xs wger-modal-dialog">{% trans 'Edit' %}</a>+ {% endif %}</div><h4 class="list-group-item-heading">{{ note.timestamp_created }} - {{ note.user|format_username }}</h4>@@ -34,6 +38,7 @@{% block sidebar %}<h4>{% trans "Options" %}</h4>+{% if perms.gym.add_adminusernote %}<p><a href="{% url 'gym:admin_note:add' member.pk %}"{% auto_link_css flavour "wger-modal-dialog" %}>@@ -45,6 +50,7 @@{% trans "Add" %}</a></p>+{% endif %}<p><a href="{% url 'core:user-overview' member.pk %}" {% auto_link_css flavour %}>diff --git a/wger/gym/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.htmlindex 77bf16ff4..eda9949e8 100644--- a/wger/gym/templates/gym/member_list.html+++ b/wger/gym/templates/gym/member_list.html@@ -175,7 +175,7 @@ $(document).ready( function () {{# #}{# Gym configuration #}{# #}-{% if perms.gym.change_gym %}+{% if perms.gym.change_gymconfig %}<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>@@ -234,7 +234,7 @@ $(document).ready( function () {{# #}{# Other options #}{# #}-{% if perms.gym.manage_gym %}+{% if perms.gym.manage_gym or perms.gym.manage_gyms %}<h4>{% trans "Options" %}</h4><p><a href="{% url 'gym:gym:add-user' gym.pk %}"diff --git a/wger/gym/tests/test_admin_config.py b/wger/gym/tests/test_admin_config.pyindex 2a360596e..3ece92ca8 100644--- a/wger/gym/tests/test_admin_config.py+++ b/wger/gym/tests/test_admin_config.py@@ -26,5 +26,10 @@ class EditConfigTestCase(WorkoutManagerEditTestCase):url = 'gym:admin_config:edit'pk = 1user_success = 'admin'- user_fail = 'trainer2'+ user_fail = ('member1',+ 'manager1',+ 'manager2',+ 'trainer4',+ 'general_manager1',+ 'general_manager2')data = {'overview_inactive': False}diff --git a/wger/gym/tests/test_admin_user_notes.py b/wger/gym/tests/test_admin_user_notes.pyindex c88be2964..14f1b4577 100644--- a/wger/gym/tests/test_admin_user_notes.py+++ b/wger/gym/tests/test_admin_user_notes.py@@ -22,7 +22,7 @@ from wger.manager.tests.testcase import WorkoutManagerEditTestCasefrom wger.gym.models import AdminUserNote-class GymOverviewTest(WorkoutManagerAccessTestCase):+class AdminNoteOverviewTest(WorkoutManagerAccessTestCase):'''Tests accessing the gym overview page'''@@ -35,10 +35,11 @@ class GymOverviewTest(WorkoutManagerAccessTestCase):'manager1','manager2','trainer4',- 'general_manager1')+ 'general_manager1',+ 'general_manager2')-class AddGymTestCase(WorkoutManagerAddTestCase):+class AddAdminNoteTestCase(WorkoutManagerAddTestCase):'''Tests adding a new gym'''@@ -53,10 +54,11 @@ class AddGymTestCase(WorkoutManagerAddTestCase):'manager1','manager2','trainer4',- 'general_manager1')+ 'general_manager1',+ 'general_manager2')-class EditConfigTestCase(WorkoutManagerEditTestCase):+class EditAdminNoteTestCase(WorkoutManagerEditTestCase):'''Tests editing an admin config'''@@ -71,11 +73,12 @@ class EditConfigTestCase(WorkoutManagerEditTestCase):'manager1','manager2','trainer4',- 'general_manager1')+ 'general_manager1',+ 'general_manager2')data = {'note': 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr'}-class DeleteGymTestCase(WorkoutManagerDeleteTestCase):+class DeleteAdminNoteTestCase(WorkoutManagerDeleteTestCase):'''Tests deleting a gym'''@@ -91,4 +94,5 @@ class DeleteGymTestCase(WorkoutManagerDeleteTestCase):'manager1','manager2','trainer4',- 'general_manager1')+ 'general_manager1',+ 'general_manager2')diff --git a/wger/gym/tests/test_gym.py b/wger/gym/tests/test_gym.pyindex 14542fed9..3b1ddc289 100644--- a/wger/gym/tests/test_gym.py+++ b/wger/gym/tests/test_gym.py@@ -30,7 +30,8 @@ class GymOverviewTest(WorkoutManagerAccessTestCase):url = 'gym:gym:list'anonymous_fail = Trueuser_success = ('admin',- 'general_manager1')+ 'general_manager1',+ 'general_manager2')user_fail = ('member1','member2','trainer2',@@ -49,7 +50,8 @@ class GymUserOverviewTest(WorkoutManagerAccessTestCase):'trainer2','trainer3','manager1',- 'general_manager1')+ 'general_manager1',+ 'general_manager2')user_fail = ('member1','member2','trainer4',@@ -96,7 +98,8 @@ class EditGymTestCase(WorkoutManagerEditTestCase):data = {'name': 'A different name'}user_success = ('admin','manager1',- 'general_manager1')+ 'general_manager1',+ 'general_manager2')user_fail = ('member1','member2','trainer2',diff --git a/wger/gym/tests/test_user.py b/wger/gym/tests/test_user.pyindex c3fce968e..a5fd91502 100644--- a/wger/gym/tests/test_user.py+++ b/wger/gym/tests/test_user.py@@ -66,18 +66,39 @@ class GymAddUserTestCase(WorkoutManagerTestCase):def test_add_user_authorized(self):'''- Tests adding a user as an administrator+ Tests adding a user as authorized user'''self.user_login('admin')self.add_user()+ def test_add_user_authorized2(self):+ '''+ Tests adding a user as authorized user+ '''+ self.user_login('general_manager1')+ self.add_user()+def test_add_user_unauthorized(self):'''- Tests adding a user a different user+ Tests adding a user an unauthorized user'''self.user_login('test')self.add_user(fail=True)+ def test_add_user_unauthorized2(self):+ '''+ Tests adding a user an unauthorized user+ '''+ self.user_login('trainer1')+ self.add_user(fail=True)++ def test_add_user_unauthorized3(self):+ '''+ Tests adding a user an unauthorized user+ '''+ self.user_login('manager3')+ self.add_user(fail=True)+def test_add_user_logged_out(self):'''Tests adding a user a logged out userdiff --git a/wger/gym/tests/test_user_config.py b/wger/gym/tests/test_user_config.pyindex 7c5ea768d..25451af97 100644--- a/wger/gym/tests/test_user_config.py+++ b/wger/gym/tests/test_user_config.py@@ -31,7 +31,8 @@ class EditConfigTestCase(WorkoutManagerEditTestCase):'trainer2','trainer3','admin')- user_fail = ('general_manager1'+ user_fail = ('general_manager1',+ 'general_manager2','member1','member2','trainer4',diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.pyindex 13d905cbb..fbc30751f 100644--- a/wger/gym/views/gym.py+++ b/wger/gym/views/gym.py@@ -17,7 +17,7 @@ import csvimport datetimeimport logging-from django.contrib.auth.decorators import login_required, permission_required+from django.contrib.auth.decorators import login_requiredfrom django.contrib.auth.models import Groupfrom django.contrib.auth.models import Userfrom django.core.urlresolvers import reverse@@ -118,12 +118,16 @@ def gym_new_user_info(request):'''Shows info about a newly created user'''- if not request.user.has_perm('gym.manage_gym'):+ if not request.user.is_authenticated():return HttpResponseForbidden()if not request.session.get('gym.user'):return HttpResponseRedirect(reverse('gym:gym:list'))+ if not request.user.has_perm('gym.manage_gyms') \+ and not request.user.has_perm('gym.manage_gym'):+ return HttpResponseForbidden()+context = {'new_user': get_object_or_404(User, pk=request.session['gym.user']['user_pk']),'password': request.session['gym.user']['password']}return render(request, 'gym/new_user.html', context)@@ -134,12 +138,16 @@ def gym_new_user_info_export(request):'''Exports the info of newly created user'''- if not request.user.has_perm('gym.manage_gym'):+ if not request.user.is_authenticated():return HttpResponseForbidden()if not request.session.get('gym.user'):return HttpResponseRedirect(reverse('gym:gym:list'))+ if not request.user.has_perm('gym.manage_gyms') \+ and not request.user.has_perm('gym.manage_gym'):+ return HttpResponseForbidden()+new_user = get_object_or_404(User, pk=request.session['gym.user']['user_pk'])new_username = new_user.usernamepassword = request.session['gym.user']['password']@@ -163,15 +171,21 @@ def gym_new_user_info_export(request):return response-@login_required-@permission_required('gym.manage_gym')def gym_permissions_user_edit(request, user_pk):'''Edits the permissions of a gym member'''- user = User.objects.get(pk=user_pk)+ user = get_object_or_404(User, pk=user_pk)++ if not request.user.is_authenticated():+ return HttpResponseForbidden()- if user.userprofile.gym != user.userprofile.gym:+ if not request.user.has_perm('gym.manage_gyms') \+ and not request.user.has_perm('gym.manage_gym'):+ return HttpResponseForbidden()++ if request.user.has_perm('gym.manage_gym') \+ and request.user.userprofile.gym != user.userprofile.gym:return HttpResponseForbidden()if request.method == 'POST':@@ -230,7 +244,7 @@ class GymAddUserView(WgerFormMixin, CreateView):model = Usertitle = ugettext_lazy('Add user to gym')success_url = reverse_lazy('gym:gym:new-user-data')- permission_required = 'gym.manage_gym'+ permission_required = ('gym.manage_gym', 'gym.manage_gyms')form_class = GymUserAddFormdef get_initial(self):@@ -246,10 +260,15 @@ class GymAddUserView(WgerFormMixin, CreateView):if not request.user.is_authenticated():return HttpResponseForbidden()- gym_id = request.user.userprofile.gym_id- if request.user.has_perm('gym.manage_gym') and gym_id == int(self.kwargs['gym_pk']):- return super(GymAddUserView, self).dispatch(request, *args, **kwargs)- return HttpResponseForbidden()+ if not request.user.has_perm('gym.manage_gyms') \+ and not request.user.has_perm('gym.manage_gym'):+ return HttpResponseForbidden()++ if request.user.has_perm('gym.manage_gym') \+ and request.user.userprofile.gym_id != int(self.kwargs['gym_pk']):+ return HttpResponseForbidden()++ return super(GymAddUserView, self).dispatch(request, *args, **kwargs)def form_valid(self, form):'''@@ -320,8 +339,7 @@ class GymUpdateView(WgerFormMixin, UpdateView):return HttpResponseForbidden()if request.user.has_perm('gym.manage_gym'):- gym_id = request.user.userprofile.gym_id- if gym_id != int(self.kwargs['pk']):+ if request.user.userprofile.gym_id != int(self.kwargs['pk']):return HttpResponseForbidden()return super(GymUpdateView, self).dispatch(request, *args, **kwargs)