Self hosted FLOSS fitness/workout, nutrition and weight tracker
Use nested namespaces for gym URLs
Roland Geiderfdc35001e792
diff --git a/wger/core/models.py b/wger/core/models.pyindex bbde605a8..f2a87b6d0 100644--- a/wger/core/models.py+++ b/wger/core/models.py@@ -550,7 +550,7 @@ class Gym(models.Model):'''Return the URL for this object'''- return reverse('core:gym-user-list', kwargs={'pk': self.pk})+ return reverse('core:gym:user-list', kwargs={'pk': self.pk})def get_owner_object(self):'''diff --git a/wger/core/templates/gym/list.html b/wger/core/templates/gym/list.htmlindex 4559c4aaf..f8011ab31 100644--- a/wger/core/templates/gym/list.html+++ b/wger/core/templates/gym/list.html@@ -12,17 +12,17 @@{% for gym in gym_list %}<li class="list-group-item "><div class="pull-right">- <a href="{% url 'core:gym-delete' gym.id %}"+ <a href="{% url 'core:gym:delete' gym.id %}"class="btn btn-danger btn-xs wger-modal-dialog">{% trans 'Delete' %}</a>- <a href="{% url 'core:gym-edit' gym.id %}"+ <a href="{% url 'core:gym:edit' gym.id %}"class="btn btn-default btn-xs wger-modal-dialog">{% trans 'Edit' %}</a></div>{% if perms.core.manage_gym and user.userprofile.gym == gym %}- <a href="{% url 'core:gym-user-list' gym.pk %}">{{gym}}</a>+ <a href="{% url 'core:gym:user-list' gym.pk %}">{{gym}}</a>{% else %}{{gym}}{% endif %}@@ -38,7 +38,7 @@{% if perms.core.add_gym %}<h4>{% trans "Options" %}</h4><p>- <a href="{% url 'core:gym-add' %}"+ <a href="{% url 'core:gym:add' %}"{% auto_link_css flavour "wger-modal-dialog" %}><img src="{% static 'images/icons/new.svg' %}"width="32"diff --git a/wger/core/templates/gym/member_list.html b/wger/core/templates/gym/member_list.htmlindex 36df158b5..04cd0a09c 100644--- a/wger/core/templates/gym/member_list.html+++ b/wger/core/templates/gym/member_list.html@@ -95,7 +95,7 @@</button><ul class="dropdown-menu" role="menu"><li>- <a href="{% url 'core:gym-edit' gym.id %}" class="wger-modal-dialog">{% trans "Edit"%}</a>+ <a href="{% url 'core:gym:edit' gym.id %}" class="wger-modal-dialog">{% trans "Edit"%}</a></li></ul></div>@@ -141,7 +141,7 @@{% if perms.core.manage_gym %}<h3>{% trans "Options" %}</h3><p>- <a href="{% url 'core:gym-add-user' gym.pk %}"+ <a href="{% url 'core:gym:add-user' gym.pk %}"{% auto_link_css flavour "wger-modal-dialog" %}><img src="{% static 'images/icons/new.svg' %}"width="32"diff --git a/wger/core/templates/gym/new_user.html b/wger/core/templates/gym/new_user.htmlindex 822935bb8..c04cf99c8 100644--- a/wger/core/templates/gym/new_user.html+++ b/wger/core/templates/gym/new_user.html@@ -26,7 +26,7 @@</tr></table>-<a href="{% url 'core:gym-user-list' new_user.userprofile.gym.pk %}" {% auto_link_css flavour %}>+<a href="{% url 'core:gym:user-list' new_user.userprofile.gym.pk %}" {% auto_link_css flavour %}><img src="{% static 'images/icons/list.svg' %}"width="32"height="32"diff --git a/wger/core/templates/mobile/navigation.html b/wger/core/templates/mobile/navigation.htmlindex f8df4239e..0cae2ecf8 100644--- a/wger/core/templates/mobile/navigation.html+++ b/wger/core/templates/mobile/navigation.html@@ -209,13 +209,13 @@<li><a href="{% url 'config:language-overview' %}">{% trans "Languages" %} </a></li><li><a href="{% url 'core:license-list' %}">{% trans "Licenses" %} </a></li>{% if perms.core.manage_gyms %}- <li><a href="{% url 'core:gym-list' %}">{% trans "Gyms" %} </a></li>+ <li><a href="{% url 'core:gym:list' %}">{% trans "Gyms" %} </a></li>{% endif %}{# it's not possible to group expressions '(a or b) and c' #}{% if perms.core.gym_trainer or perms.core.manage_gym %}{% if user.userprofile.gym %}- <li><a href="{% url 'core:gym-user-list' user.userprofile.gym.pk %}">{{user.userprofile.gym}}</a></li>+ <li><a href="{% url 'core:gym:user-list' user.userprofile.gym.pk %}">{{user.userprofile.gym}}</a></li>{% endif %}{% endif %}{% endif %}diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.htmlindex cc28923d6..4f5e23d5e 100644--- a/wger/core/templates/navigation.html+++ b/wger/core/templates/navigation.html@@ -174,13 +174,13 @@<li><a href="{% url 'config:language-overview' %}">{% trans "Languages" %} </a></li><li><a href="{% url 'core:license-list' %}">{% trans "Licenses" %} </a></li>{% if perms.core.manage_gyms %}- <li><a href="{% url 'core:gym-list' %}">{% trans "Gyms" %} </a></li>+ <li><a href="{% url 'core:gym:list' %}">{% trans "Gyms" %} </a></li>{% endif %}{# it's not possible to group expressions '(a or b) and c' #}{% if perms.core.gym_trainer or perms.core.manage_gym %}{% if user.userprofile.gym %}- <li><a href="{% url 'core:gym-user-list' user.userprofile.gym.pk %}">{{user.userprofile.gym}}</a></li>+ <li><a href="{% url 'core:gym:user-list' user.userprofile.gym.pk %}">{{user.userprofile.gym}}</a></li>{% endif %}{% endif %}{% endif %}diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.htmlindex 731d253ca..237434f87 100644--- a/wger/core/templates/user/overview.html+++ b/wger/core/templates/user/overview.html@@ -147,7 +147,7 @@{% endif %}</table>-<a href="{% url 'core:gym-user-list' current_user.userprofile.gym.pk %}" {% auto_link_css flavour %}>+<a href="{% url 'core:gym:user-list' current_user.userprofile.gym.pk %}" {% auto_link_css flavour %}><img src="{% static 'images/icons/list.svg' %}"width="32"height="32"diff --git a/wger/core/tests/test_gym.py b/wger/core/tests/test_gym.pyindex 10fdc111e..61d8705ae 100644--- a/wger/core/tests/test_gym.py+++ b/wger/core/tests/test_gym.py@@ -28,7 +28,7 @@ class GymOverviewTest(WorkoutManagerAccessTestCase):'''Tests accessing the gym overview page'''- url = 'core:gym-list'+ url = 'core:gym:list'anonymous_fail = True@@ -36,7 +36,7 @@ class GymUserOverviewTest(WorkoutManagerAccessTestCase):'''Tests accessing the gym user overview page'''- url = reverse_lazy('core:gym-user-list', kwargs={'pk': 1})+ url = reverse_lazy('core:gym:user-list', kwargs={'pk': 1})anonymous_fail = True@@ -45,7 +45,7 @@ class AddGymTestCase(WorkoutManagerAddTestCase):Tests adding a new gym'''object_class = Gym- url = 'core:gym-add'+ url = 'core:gym:add'data = {'name': 'The name her'}pk = 4@@ -56,7 +56,7 @@ class DeleteGymTestCase(WorkoutManagerDeleteTestCase):'''object_class = Gym- url = 'core:gym-delete'+ url = 'core:gym:delete'pk = 2@@ -66,7 +66,7 @@ class EditGymTestCase(WorkoutManagerEditTestCase):'''object_class = Gym- url = 'core:gym-edit'+ url = 'core:gym:edit'pk = 1data = {'name': 'A different name'}diff --git a/wger/core/tests/test_user.py b/wger/core/tests/test_user.pyindex 33f37b804..b783874ce 100644--- a/wger/core/tests/test_user.py+++ b/wger/core/tests/test_user.py@@ -115,13 +115,13 @@ class GymAddUserTestCase(WorkoutManagerTestCase):Helper function to add users'''count_before = User.objects.all().count()- response = self.client.get(reverse('core:gym-add-user', kwargs={'gym_pk': 1}))+ response = self.client.get(reverse('core:gym:add-user', kwargs={'gym_pk': 1}))if fail:self.assertEqual(response.status_code, 403)else:self.assertEqual(response.status_code, 200)- response = self.client.post(reverse('core:gym-add-user', kwargs={'gym_pk': 1}),+ response = self.client.post(reverse('core:gym:add-user', kwargs={'gym_pk': 1}),{'first_name': 'Cletus','last_name': 'Spuckle','username': 'cletus',diff --git a/wger/core/urls.py b/wger/core/urls.pyindex fb83a39eb..a1eaa1cf7 100644--- a/wger/core/urls.py+++ b/wger/core/urls.py@@ -15,7 +15,7 @@# You should have received a copy of the GNU Affero General Public License-from django.conf.urls import patterns, url+from django.conf.urls import patterns, url, includefrom django.views.generic import TemplateViewfrom django.contrib.auth import viewsfrom django.core.urlresolvers import reverse_lazy@@ -25,6 +25,30 @@ from wger.core.views import miscfrom wger.core.views import licensefrom wger.core.views import gym+# Gyms+patterns_gym = patterns('',+ url(r'^list$',+ gym.GymListView.as_view(),+ name='list'),+ url(r'^new-user-data$',+ gym.gym_new_user_info,+ name='new-user-data'),+ url(r'^(?P<pk>\d+)/members',+ gym.GymUserListView.as_view(),+ name='user-list'),+ url(r'^(?P<gym_pk>\d+)/add-member',+ gym.GymAddUserView.as_view(),+ name='add-user'),+ url(r'^add$',+ gym.GymAddView.as_view(),+ name='add'),+ url(r'^(?P<pk>\d+)/edit',+ gym.GymUpdateView.as_view(),+ name='edit'),+ url(r'^(?P<pk>\d+)/delete',+ gym.GymDeleteView.as_view(),+ name='delete'),+)urlpatterns = patterns('',@@ -87,28 +111,7 @@ urlpatterns = patterns('',license.LicenseDeleteView.as_view(),name='license-delete'),- # Gyms- url(r'^gym/list$',- gym.GymListView.as_view(),- name='gym-list'),- url(r'^gym/new-user-data$',- gym.gym_new_user_info,- name='gym-new-user-data'),- url(r'^gym/(?P<pk>\d+)/members',- gym.GymUserListView.as_view(),- name='gym-user-list'),- url(r'^gym/(?P<gym_pk>\d+)/add-member',- gym.GymAddUserView.as_view(),- name='gym-add-user'),- url(r'^gym/add$',- gym.GymAddView.as_view(),- name='gym-add'),- url(r'^gym/(?P<pk>\d+)/edit',- gym.GymUpdateView.as_view(),- name='gym-edit'),- url(r'^gym/(?P<pk>\d+)/delete',- gym.GymDeleteView.as_view(),- name='gym-delete'),+ url(r'^gym/', include(patterns_gym, namespace="gym")),diff --git a/wger/core/views/gym.py b/wger/core/views/gym.pyindex 5d24453f2..8ecd19c4e 100644--- a/wger/core/views/gym.py+++ b/wger/core/views/gym.py@@ -89,8 +89,10 @@ class GymUserListView(WgerPermissionMixin, ListView):'''context = super(GymUserListView, self).get_context_data(**kwargs)context['gym'] = Gym.objects.get(pk=self.kwargs['pk'])- context['admin_count'] = len([i for i in context['object_list'] if i['perms']['any_admin']])- context['user_count'] = len([i for i in context['object_list'] if not i['perms']['any_admin']])+ context['admin_count'] = len([i for i in context['object_list']+ if i['perms']['any_admin']])+ context['user_count'] = len([i for i in context['object_list']+ if not i['perms']['any_admin']])return context@@ -100,9 +102,9 @@ class GymAddView(WgerFormMixin, CreateView):'''model = Gym- success_url = reverse_lazy('core:gym-list')+ success_url = reverse_lazy('core:gym:list')title = ugettext_lazy('Add gym')- form_action = reverse_lazy('core:gym-add')+ form_action = reverse_lazy('core:gym:add')permission_required = 'core.add_gym'@@ -175,7 +177,7 @@ class GymAddUserView(WgerFormMixin, CreateView):def get_context_data(self, **kwargs):context = super(GymAddUserView, self).get_context_data(**kwargs)- context['form_action'] = reverse('core:gym-add-user',+ context['form_action'] = reverse('core:gym:add-user',kwargs={'gym_pk': self.kwargs['gym_pk']})return context@@ -194,7 +196,7 @@ class GymUpdateView(WgerFormMixin, UpdateView):Send some additional data to the template'''context = super(GymUpdateView, self).get_context_data(**kwargs)- context['form_action'] = reverse('core:gym-edit', kwargs={'pk': self.object.id})+ context['form_action'] = reverse('core:gym:edit', kwargs={'pk': self.object.id})context['title'] = _(u'Edit {0}'.format(self.object))return context@@ -205,7 +207,7 @@ class GymDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):'''model = Gym- success_url = reverse_lazy('core:gym-list')+ success_url = reverse_lazy('core:gym:list')permission_required = 'core.delete_gym'def get_context_data(self, **kwargs):@@ -214,5 +216,5 @@ class GymDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):'''context = super(GymDeleteView, self).get_context_data(**kwargs)context['title'] = _(u'Delete {0}?'.format(self.object))- context['form_action'] = reverse('core:gym-delete', kwargs={'pk': self.kwargs['pk']})+ context['form_action'] = reverse('core:gym:delete', kwargs={'pk': self.kwargs['pk']})return contextdiff --git a/wger/core/views/user.py b/wger/core/views/user.pyindex f9de7218c..1a7be8121 100644--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@ -126,7 +126,7 @@ def trainer_login(request, user_pk):else:return HttpResponseRedirect(reverse('core:index'))else:- return HttpResponseRedirect(reverse('core:gym-user-list',+ return HttpResponseRedirect(reverse('core:gym:user-list',kwargs={'pk': user.userprofile.gym_id}))