Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add simple view to edit the roles of gym members

Roland Geiderb86b31e7c704
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.html
index d4d8de47f..a9f501959 100644
--- a/wger/core/templates/user/overview.html
+++ b/wger/core/templates/user/overview.html
@@ -171,6 +171,7 @@
<li>
<a href="{% url 'core:user-edit' current_user.pk %}" class="wger-modal-dialog">{% trans "Edit"%}</a>
</li>
+ <li class="divider"></li>
<li>
{% if current_user.is_active %}
<a href="{% url 'core:user-deactivate' current_user.pk %}" >{% trans "Deactivate user"%}</a>
@@ -178,6 +179,11 @@
<a href="{% url 'core:user-activate' current_user.pk %}">{% trans "Activate user"%}</a>
{% endif %}
</li>
+ {% if perms.gym.manage_gym or perms.gym.manage_gyms %}
+ <li>
+ <a href="{% url 'gym:gym:edit-user-permission' current_user.pk %}" class="wger-modal-dialog">{% trans "Roles"%}</a>
+ </li>
+ {% endif %}
<li>
<a href="{% url 'core:user-delete' current_user.pk %}" class="wger-modal-dialog">{% trans "Delete"%}</a>
</li>
diff --git a/wger/gym/forms.py b/wger/gym/forms.py
index 170e5b9f2..b682d7748 100644
--- a/wger/gym/forms.py
+++ b/wger/gym/forms.py
@@ -20,9 +20,9 @@ from django.utils.translation import ugettext as _
from wger.core.forms import UserPersonalInformationForm
-class GymUserAddForm(UserPersonalInformationForm):
+class GymUserPermisssionForm(forms.ModelForm):
'''
- Form used when adding a user to a gym
+ Form used to set the permission group of a gym member
'''
USER = 'user'
GYM_ADMIN = 'admin'
@@ -35,8 +35,23 @@ class GymUserAddForm(UserPersonalInformationForm):
(MANAGER, _('General manager')),
)
+ class Meta:
+ model = User
+ fields = ('role',)
+
role = forms.MultipleChoiceField(choices=ROLES,
initial=USER)
+
+
+class GymUserAddForm(GymUserPermisssionForm, UserPersonalInformationForm):
+ '''
+ Form used when adding a user to a gym
+ '''
+
+ class Meta:
+ model = User
+ fields = ('first_name', 'last_name', 'username', 'email', 'role',)
+
username = forms.RegexField(label=_("Username"),
max_length=30,
regex=r'^[\w.@+-]+$',
@@ -46,10 +61,6 @@ class GymUserAddForm(UserPersonalInformationForm):
'invalid': _("This value may contain only letters, numbers and "
"@/.//-/_ characters.")})
- class Meta:
- model = User
- fields = ('first_name', 'last_name', 'username', 'email', 'role',)
-
def clean_username(self):
'''
Since User.username is unique, this check is redundant,
diff --git a/wger/gym/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.html
index 8816aabfa..aaea9c5fa 100644
--- a/wger/gym/templates/gym/member_list.html
+++ b/wger/gym/templates/gym/member_list.html
@@ -67,6 +67,9 @@ $(document).ready( function () {
<th style="width: 10%;">{% trans "ID" %}</th>
<th style="width: 40%;">{% trans "Username" %}</th>
<th>{% trans "Name" %}</th>
+ {% if perms.gym.manage_gym or perms.gym.manage_gyms %}
+ <th>{% trans "Actions" %}</th>
+ {% endif %}
</tr>
</thead>
<tbody>
@@ -94,11 +97,19 @@ $(document).ready( function () {
<td>
{{current_user.obj.get_full_name}}
</td>
+
+ {% if perms.gym.manage_gym or perms.gym.manage_gyms %}
+ <td style="text-align: right;">
+ <a href="{% url 'gym:gym:edit-user-permission' current_user.obj.pk %}" class="btn btn-default btn-xs wger-modal-dialog">
+ <span class="glyphicon glyphicon-wrench"></span>
+ </a>
+ </td>
+ {% endif %}
</tr>
{% endif %}
{% empty %}
<tr>
- <td colspan="2">{% trans "No users for this gym found" %}</td>
+ <td colspan="3">{% trans "No users for this gym found" %}</td>
</tr>
{% endfor %}
</tbody>
diff --git a/wger/gym/urls.py b/wger/gym/urls.py
index 197e14c89..2bd82805e 100644
--- a/wger/gym/urls.py
+++ b/wger/gym/urls.py
@@ -50,6 +50,9 @@ patterns_gym = patterns('',
url(r'^(?P<pk>\d+)/delete$',
gym.GymDeleteView.as_view(),
name='delete'),
+ url(r'^user/(?P<user_pk>\d+)/permission-edit$',
+ gym.gym_permissions_user_edit,
+ name='edit-user-permission'),
)
# 'sub patterns' for gym config
diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.py
index a76a778f8..13d905cbb 100644
--- a/wger/gym/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -17,7 +17,7 @@ import csv
import datetime
import logging
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.decorators import login_required, permission_required
from django.contrib.auth.models import Group
from django.contrib.auth.models import User
from django.core.urlresolvers import reverse
@@ -31,7 +31,7 @@ from django.views.generic import DeleteView
from django.views.generic import CreateView
from django.views.generic import UpdateView
-from wger.gym.forms import GymUserAddForm
+from wger.gym.forms import GymUserAddForm, GymUserPermisssionForm
from wger.gym.helpers import get_user_last_activity, is_any_gym_admin
from wger.gym.models import Gym
from wger.gym.models import GymAdminConfig
@@ -163,6 +163,65 @@ 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)
+
+ if user.userprofile.gym != user.userprofile.gym:
+ return HttpResponseForbidden()
+
+ if request.method == 'POST':
+ form = GymUserPermisssionForm(request.POST)
+
+ 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'))
+
+ # Set appropriate permission groups
+ if 'user' in form.cleaned_data['role']:
+ user.groups.add(Group.objects.get(name='gym_member'))
+ if 'trainer' in form.cleaned_data['role']:
+ user.groups.add(Group.objects.get(name='gym_trainer'))
+ if 'admin' in form.cleaned_data['role']:
+ user.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'))
+
+ return HttpResponseRedirect(reverse('gym:gym:user-list',
+ kwargs={'pk': user.userprofile.gym.pk}))
+ else:
+ initial_data = {}
+ if user.groups.filter(name='gym_member').exists():
+ initial_data['user'] = True
+
+ if user.groups.filter(name='gym_trainer').exists():
+ initial_data['trainer'] = True
+
+ if user.groups.filter(name='gym_manager').exists():
+ initial_data['admin'] = True
+
+ if user.groups.filter(name='general_gym_manager').exists():
+ initial_data['manager'] = True
+
+ form = GymUserPermisssionForm(initial={'role': initial_data})
+
+ context = {}
+ context['title'] = user.get_full_name()
+ context['form'] = form
+ context['form_action'] = reverse('gym:gym:edit-user-permission', kwargs={'user_pk': user.pk})
+ context['extend_template'] = 'base_empty.html' if request.is_ajax() else 'base.html'
+
+ return render(request, 'form.html', context)
+
+
class GymAddUserView(WgerFormMixin, CreateView):
'''
View to add a user to a new gym