Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add permission checks for gym members
Roland Geidere3cabf32ee15
diff --git a/wger/gym/forms.py b/wger/gym/forms.pyindex b682d7748..54411f2bf 100644--- a/wger/gym/forms.py+++ b/wger/gym/forms.py@@ -28,12 +28,9 @@ class GymUserPermisssionForm(forms.ModelForm):GYM_ADMIN = 'admin'TRAINER = 'trainer'MANAGER = 'manager'- ROLES = (- (USER, _('User')),- (TRAINER, _('Trainer')),- (GYM_ADMIN, _('Gym administrator')),- (MANAGER, _('General manager')),- )++ # Empty default roles, they are always set at run time+ ROLES = ()class Meta:model = User@@ -42,6 +39,23 @@ class GymUserPermisssionForm(forms.ModelForm):role = forms.MultipleChoiceField(choices=ROLES,initial=USER)+ def __init__(self, available_roles=[], *args, **kwargs):+ '''+ Custom logic to reduce the available permissions+ '''+ super(GymUserPermisssionForm, self).__init__(*args, **kwargs)++ field_choices = [(self.USER, _('User'))]+ if 'trainer' in available_roles:+ field_choices.append((self.TRAINER, _('Trainer')))+ if 'admin' in available_roles:+ field_choices.append((self.GYM_ADMIN, _('Gym administrator')))+ if 'manager' in available_roles:+ field_choices.append((self.MANAGER, _('General manager')))++ self.fields['role'] = forms.MultipleChoiceField(choices=field_choices,+ initial=User)+class GymUserAddForm(GymUserPermisssionForm, UserPersonalInformationForm):'''diff --git a/wger/gym/helpers.py b/wger/gym/helpers.pyindex d6183090e..ea6f0148c 100644--- a/wger/gym/helpers.py+++ b/wger/gym/helpers.py@@ -53,3 +53,26 @@ def is_any_gym_admin(user):return user.has_perm('gym.manage_gym')\or user.has_perm('gym.manage_gyms')\or user.has_perm('gym.gym_trainer')+++def get_permission_list(user):+ '''+ Calculate available user permissions++ This is needed because a user shouldn't be able to create or give another+ account with more permissions than himself.++ :param user: the user creating the account+ :return: a list of permissions+ '''++ form_group_permission = ['user', 'trainer']++ if user.has_perm('gym.manage_gym'):+ form_group_permission.append('admin')++ if user.has_perm('gym.manage_gyms'):+ form_group_permission.append('admin')+ form_group_permission.append('manager')++ return form_group_permissiondiff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.pyindex 0c9bd53e5..2b534825c 100644--- a/wger/gym/views/gym.py+++ b/wger/gym/views/gym.py@@ -39,7 +39,11 @@ from django.views.generic import ()from wger.gym.forms import GymUserAddForm, GymUserPermisssionForm-from wger.gym.helpers import get_user_last_activity, is_any_gym_admin+from wger.gym.helpers import (+ get_user_last_activity,+ is_any_gym_admin,+ get_permission_list+)from wger.gym.models import (Gym,GymAdminConfig,@@ -200,62 +204,66 @@ def gym_permissions_user_edit(request, user_pk):'''Edits the permissions of a gym member'''- user = get_object_or_404(User, pk=user_pk)+ member = get_object_or_404(User, pk=user_pk)+ user = request.user- if not request.user.is_authenticated():+ if not user.is_authenticated():return HttpResponseForbidden()- if not request.user.has_perm('gym.manage_gyms') \- and not request.user.has_perm('gym.manage_gym'):+ if not user.has_perm('gym.manage_gyms') and not user.has_perm('gym.manage_gym'):return HttpResponseForbidden()- if request.user.has_perm('gym.manage_gym') \- and request.user.userprofile.gym != user.userprofile.gym:+ if user.has_perm('gym.manage_gym') and user.userprofile.gym != member.userprofile.gym:return HttpResponseForbidden()+ # Calculate available user permissions+ form_group_permission = get_permission_list(user)+if request.method == 'POST':- form = GymUserPermisssionForm(request.POST)+ form = GymUserPermisssionForm(request.POST,+ available_roles=form_group_permission)if form.is_valid():# Remove the user from all gym permission groups- user.groups.remove(Group.objects.get(name='gym_member'))- user.groups.remove(Group.objects.get(name='gym_trainer'))- user.groups.remove(Group.objects.get(name='gym_manager'))- user.groups.remove(Group.objects.get(name='general_gym_manager'))+ member.groups.remove(Group.objects.get(name='gym_member'))+ member.groups.remove(Group.objects.get(name='gym_trainer'))+ member.groups.remove(Group.objects.get(name='gym_manager'))+ member.groups.remove(Group.objects.get(name='general_gym_manager'))# Set appropriate permission groupsif 'user' in form.cleaned_data['role']:- user.groups.add(Group.objects.get(name='gym_member'))+ member.groups.add(Group.objects.get(name='gym_member'))if 'trainer' in form.cleaned_data['role']:- user.groups.add(Group.objects.get(name='gym_trainer'))+ member.groups.add(Group.objects.get(name='gym_trainer'))if 'admin' in form.cleaned_data['role']:- user.groups.add(Group.objects.get(name='gym_manager'))+ member.groups.add(Group.objects.get(name='gym_manager'))if 'manager' in form.cleaned_data['role']:- user.groups.add(Group.objects.get(name='general_gym_manager'))+ member.groups.add(Group.objects.get(name='general_gym_manager'))return HttpResponseRedirect(reverse('gym:gym:user-list',- kwargs={'pk': user.userprofile.gym.pk}))+ kwargs={'pk': member.userprofile.gym.pk}))else:initial_data = {}- if user.groups.filter(name='gym_member').exists():+ if member.groups.filter(name='gym_member').exists():initial_data['user'] = True- if user.groups.filter(name='gym_trainer').exists():+ if member.groups.filter(name='gym_trainer').exists():initial_data['trainer'] = True- if user.groups.filter(name='gym_manager').exists():+ if member.groups.filter(name='gym_manager').exists():initial_data['admin'] = True- if user.groups.filter(name='general_gym_manager').exists():+ if member.groups.filter(name='general_gym_manager').exists():initial_data['manager'] = True- form = GymUserPermisssionForm(initial={'role': initial_data})+ form = GymUserPermisssionForm(initial={'role': initial_data},+ available_roles=form_group_permission)context = {}- context['title'] = user.get_full_name()+ context['title'] = member.get_full_name()context['form'] = form- context['form_action'] = reverse('gym:gym:edit-user-permission', kwargs={'user_pk': user.pk})+ context['form_action'] = reverse('gym:gym:edit-user-permission', kwargs={'user_pk': member.pk})context['extend_template'] = 'base_empty.html' if request.is_ajax() else 'base.html'context['submit_text'] = 'Save'@@ -299,6 +307,13 @@ class GymAddUserView(WgerFormMixin, CreateView):return super(GymAddUserView, self).dispatch(request, *args, **kwargs)+ def get_form(self):+ '''+ Set available user permissions+ '''+ return self.form_class(available_roles=get_permission_list(self.request.user),+ **self.get_form_kwargs())+def form_valid(self, form):'''Create the user, set the user permissions and gym