Self hosted FLOSS fitness/workout, nutrition and weight tracker
Some changes to gym permissions
Roland Geider133cb7a7de0d
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.htmlindex 43ea86a5e..9f44ff0fe 100644--- a/wger/core/templates/user/overview.html+++ b/wger/core/templates/user/overview.html@@ -5,20 +5,22 @@{% block breadcrumbs %}- {{ block.super }}+ {% if current_user.userprofile.gym %}+ {{ block.super }}- {% if perms.gym.manage_gyms %}- {% breadcrumb "Gyms" "gym:gym:list" %}+ {% if perms.gym.manage_gyms %}+ {% breadcrumb "Gyms" "gym:gym:list" %}+ {% endif %}+ {% breadcrumb_raw current_user.userprofile.gym "gym:gym:user-list" current_user.userprofile.gym.pk %}+ {% breadcrumb_raw current_user|format_username "core:user:overview" current_user.pk %}{% endif %}- {% breadcrumb_raw current_user.userprofile.gym "gym:gym:user-list" current_user.userprofile.gym.pk %}- {% breadcrumb_raw current_user|format_username "core:user:overview" current_user.pk %}{% endblock %}{% block content %}{% url 'core:user:trainer-login' current_user.pk as trainer_login %}-{% if not perms.gym.manage_gyms %}+{% if perms.gym.gym_trainer %}<h4>{% trans "Workouts" %} <small>({% blocktrans with number=10 %}last {{ number }}{% endblocktrans %})</small></h4>{% if perms.gym.gym_trainer %}@@ -426,7 +428,7 @@{# #}{# Gym configuration #}{# #}-{% if perms.gym.change_gymuserconfig %}+{% if perms.gym.change_gymuserconfig and current_user.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>diff --git a/wger/core/tests/test_user.py b/wger/core/tests/test_user.pyindex 8c8d8191b..12b7cdf19 100644--- a/wger/core/tests/test_user.py+++ b/wger/core/tests/test_user.py@@ -190,3 +190,21 @@ class UserDetailPageTestCase(WorkoutManagerAccessTestCase):'manager3','member1','member2')+++class UserDetailPageTestCase2(WorkoutManagerAccessTestCase):+ '''+ Test accessing the user detail page+ '''++ url = reverse_lazy('core:user:overview', kwargs={'pk': 19})+ user_success = ('trainer4',+ 'trainer5',+ 'manager3',+ 'general_manager1',+ 'general_manager2')+ user_fail = ('trainer1',+ 'trainer2',+ 'manager1',+ 'member1',+ 'member2')diff --git a/wger/core/views/user.py b/wger/core/views/user.pyindex 525eaf174..230b7fa4f 100644--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@ -439,7 +439,10 @@ class UserDetailView(WgerPermissionMixin, DetailView):def dispatch(self, request, *args, **kwargs):'''- Only managers for this gym can access the members+ Check permissions++ - Only managers for this gym can access the members+ - General managers can access the detail page of all users'''user = request.user@@ -447,6 +450,7 @@ class UserDetailView(WgerPermissionMixin, DetailView):return HttpResponseForbidden()if (user.has_perm('gym.manage_gym') or user.has_perm('gym.gym_trainer')) \+ and not user.has_perm('gym.manage_gyms') \and user.userprofile.gym != self.get_object().userprofile.gym:return HttpResponseForbidden()