Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use nested namespaces for configuration URLs

Roland Geiderd5796a624262
diff --git a/wger/config/templates/language/overview.html b/wger/config/templates/language/overview.html
index c48ffba7a..9562ea43d 100644
--- a/wger/config/templates/language/overview.html
+++ b/wger/config/templates/language/overview.html
@@ -16,7 +16,7 @@
{% for language in language_list %}
<tr>
<td>{{language.short_name}}</td>
- <td><a href="{% url 'config:language-view' language.id %}">{{language.full_name}}</a></td>
+ <td><a href="{% url 'config:language:view' language.id %}">{{language.full_name}}</a></td>
</tr>
{% endfor %}
</tbody>
@@ -29,7 +29,7 @@
{% block sidebar %}
<h3>{% trans "Options" %}</h3>
<p>
- <a href="{% url 'config:language-add' %}" {% auto_link_css flavour "wger-modal-dialog" %}>
+ <a href="{% url 'config:language:add' %}" {% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/folder-new.svg' %}"
width="32"
height="32"
diff --git a/wger/config/templates/language/view.html b/wger/config/templates/language/view.html
index 9a07ed899..4b72203a7 100644
--- a/wger/config/templates/language/view.html
+++ b/wger/config/templates/language/view.html
@@ -45,7 +45,7 @@ in A).{% endblocktrans %}</p>
{% endifchanged %}
<tr>
<td>
- <a href="{% url 'config:languageconfig-edit' config.id %}" class="wger-modal-dialog">
+ <a href="{% url 'config:language_config:edit' config.id %}" class="wger-modal-dialog">
{{config.language_target.full_name}}
</a>
</td>
@@ -68,7 +68,7 @@ in A).{% endblocktrans %}</p>
<h3>{% trans "Options" %}</h3>
<p>
- <a href="{% url 'config:language-edit' view_language.id %}"
+ <a href="{% url 'config:language:edit' view_language.id %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/edit.svg' %}"
width="32"
@@ -80,7 +80,7 @@ in A).{% endblocktrans %}</p>
</p>
<p>
- <a href="{% url 'config:language-delete' view_language.id %}"
+ <a href="{% url 'config:language:delete' view_language.id %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/trash.svg' %}"
width="32"
diff --git a/wger/config/tests/test_language_config.py b/wger/config/tests/test_language_config.py
index 6f33dea29..971b88065 100644
--- a/wger/config/tests/test_language_config.py
+++ b/wger/config/tests/test_language_config.py
@@ -26,6 +26,6 @@ class EditLanguageConfigTestCase(WorkoutManagerEditTestCase):
'''
object_class = LanguageConfig
- url = 'config:languageconfig-edit'
+ url = 'config:language_config:edit'
pk = 1
data = {'show': False}
diff --git a/wger/config/urls.py b/wger/config/urls.py
index 7b892e975..53a708b66 100644
--- a/wger/config/urls.py
+++ b/wger/config/urls.py
@@ -15,39 +15,54 @@
# You should have received a copy of the GNU Affero General Public License
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
-from django.conf.urls import patterns, url
+from django.conf.urls import patterns, url, include
from wger.config.views import languages
from wger.config.views import language_config
from wger.config.views import gym_config
-urlpatterns = patterns('',
-
- # Languages
- url(r'^language/list$',
+# sub patterns for languages
+patterns_language = patterns('',
+ url(r'^list$',
languages.LanguageListView.as_view(),
- name='language-overview'),
- url(r'^language/(?P<pk>\d+)/view$',
+ name='overview'),
+ url(r'^(?P<pk>\d+)/view$',
languages.LanguageDetailView.as_view(),
- name='language-view'),
- url(r'^language/(?P<pk>\d+)/delete$',
+ name='view'),
+ url(r'^(?P<pk>\d+)/delete$',
languages.LanguageDeleteView.as_view(),
- name='language-delete'),
- url(r'^language/(?P<pk>\d+)/edit',
+ name='delete'),
+ url(r'^(?P<pk>\d+)/edit',
languages.LanguageEditView.as_view(),
- name='language-edit'),
- url(r'^language/add$',
+ name='edit'),
+ url(r'^add$',
languages.LanguageCreateView.as_view(),
- name='language-add'),
+ name='add'),
+)
- # Language configs
- url(r'^language-config/(?P<pk>\d+)/edit',
+
+# sub patterns for language configs
+patterns_language_config = patterns('',
+ url(r'^(?P<pk>\d+)/edit',
language_config.LanguageConfigUpdateView.as_view(),
- name='languageconfig-edit'),
+ name='edit'),
+)
+
- # Gym config
- url(r'^default-gym',
+# sub patterns for default gym
+patterns_gym_config = patterns('',
+ url(r'^edit$',
gym_config.GymConfigUpdateView.as_view(),
- name='gymconfig-edit'),
+ name='edit'),
+)
+
+
+#
+# Actual patterns
+#
+urlpatterns = patterns('',
+ url(r'^language/', include(patterns_language, namespace="language")),
+ url(r'^language-config/', include(patterns_language_config, namespace="language_config")),
+ url(r'^gym-config/', include(patterns_gym_config, namespace="gym_config")),
)
diff --git a/wger/config/views/gym_config.py b/wger/config/views/gym_config.py
index c32bab236..ab4616490 100644
--- a/wger/config/views/gym_config.py
+++ b/wger/config/views/gym_config.py
@@ -44,6 +44,6 @@ class GymConfigUpdateView(WgerFormMixin, UpdateView):
def get_context_data(self, **kwargs):
context = super(GymConfigUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('config:gymconfig-edit')
+ context['form_action'] = reverse('config:gym_config:edit')
context['title'] = _('Edit')
return context
diff --git a/wger/config/views/language_config.py b/wger/config/views/language_config.py
index 52a97c786..5e840d07e 100644
--- a/wger/config/views/language_config.py
+++ b/wger/config/views/language_config.py
@@ -39,11 +39,11 @@ class LanguageConfigUpdateView(WgerFormMixin, UpdateView):
'''
Return to the language page
'''
- return reverse_lazy('config:language-view', kwargs={'pk': self.object.language_id})
+ return reverse_lazy('config:language:view', kwargs={'pk': self.object.language_id})
def get_context_data(self, **kwargs):
context = super(LanguageConfigUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('config:languageconfig-edit',
+ context['form_action'] = reverse('config:language_config:edit',
kwargs={'pk': self.object.id})
context['title'] = _('Edit')
diff --git a/wger/config/views/languages.py b/wger/config/views/languages.py
index dbcc97e7f..46adf1467 100644
--- a/wger/config/views/languages.py
+++ b/wger/config/views/languages.py
@@ -60,7 +60,7 @@ class LanguageCreateView(WgerFormMixin, CreateView):
model = Language
title = ugettext_lazy('Add new language')
- form_action = reverse_lazy('config:language-add')
+ form_action = reverse_lazy('config:language:add')
permission_required = 'core.add_language'
@@ -70,7 +70,7 @@ class LanguageDeleteView(WgerDeleteMixin, DeleteView):
'''
model = Language
- success_url = reverse_lazy('config:language-overview')
+ success_url = reverse_lazy('config:language:overview')
messages = ugettext_lazy('Language successfully deleted')
permission_required = 'core.delete_language'
@@ -79,7 +79,7 @@ class LanguageDeleteView(WgerDeleteMixin, DeleteView):
context = super(LanguageDeleteView, self).get_context_data(**kwargs)
context['title'] = _(u'Delete {0}?').format(self.object.full_name)
- context['form_action'] = reverse('config:language-delete', kwargs={'pk': self.object.id})
+ context['form_action'] = reverse('config:language:delete', kwargs={'pk': self.object.id})
return context
@@ -91,5 +91,5 @@ class LanguageEditView(WgerFormMixin, UpdateView):
model = Language
title = ugettext_lazy('Edit')
- form_action_urlname = 'config:language-edit'
+ form_action_urlname = 'config:language:edit'
permission_required = 'core.change_language'
diff --git a/wger/core/models.py b/wger/core/models.py
index dfd1d24c8..dfadfa0cd 100644
--- a/wger/core/models.py
+++ b/wger/core/models.py
@@ -65,7 +65,7 @@ class Language(models.Model):
'''
Returns the canonical URL to view a language
'''
- return reverse('config:language-view', kwargs={'pk': self.id})
+ return reverse('config:language:view', kwargs={'pk': self.id})
#
# Own methods
diff --git a/wger/core/templates/mobile/navigation.html b/wger/core/templates/mobile/navigation.html
index 2b45beca1..90aa03309 100644
--- a/wger/core/templates/mobile/navigation.html
+++ b/wger/core/templates/mobile/navigation.html
@@ -207,7 +207,7 @@
<li class="divider"></li>
<li class="nav-header">{% trans "Administration" %}</li>
{% if perms.core.change_language %}
- <li><a href="{% url 'config:language-overview' %}">{% trans "Languages" %} </a></li>
+ <li><a href="{% url 'config:language:overview' %}">{% trans "Languages" %} </a></li>
{% endif %}
{% if perms.core.change_license %}
<li><a href="{% url 'core:license-list' %}">{% trans "Licenses" %} </a></li>
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index c55119d33..ca79f23f0 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -172,7 +172,7 @@
<li class="divider"></li>
<li class="nav-header">{% trans "Administration" %}</li>
{% if perms.core.change_language %}
- <li><a href="{% url 'config:language-overview' %}">{% trans "Languages" %} </a></li>
+ <li><a href="{% url 'config:language:overview' %}">{% trans "Languages" %} </a></li>
{% endif %}
{% if perms.core.change_license %}
<li><a href="{% url 'core:license-list' %}">{% trans "Licenses" %} </a></li>
diff --git a/wger/core/tests/test_language.py b/wger/core/tests/test_language.py
index f90b661d5..8bbc0d51a 100644
--- a/wger/core/tests/test_language.py
+++ b/wger/core/tests/test_language.py
@@ -30,7 +30,7 @@ class LanguageOverviewTest(WorkoutManagerAccessTestCase):
Tests accessing the system's languages
'''
- url = 'config:language-overview'
+ url = 'config:language:overview'
anonymous_fail = True
@@ -39,7 +39,7 @@ class LanguageDetailViewTest(WorkoutManagerAccessTestCase):
Tests accessing a detail view of a language
'''
- url = reverse_lazy('config:language-view', kwargs={'pk': 1})
+ url = reverse_lazy('config:language:view', kwargs={'pk': 1})
anonymous_fail = True
@@ -49,7 +49,7 @@ class CreateLanguageTestCase(WorkoutManagerAddTestCase):
'''
object_class = Language
- url = 'config:language-add'
+ url = 'config:language:add'
data = {'short_name': 'dk',
'full_name': 'Dansk'}
@@ -60,7 +60,7 @@ class EditLanguageTestCase(WorkoutManagerEditTestCase):
'''
object_class = Language
- url = 'config:language-edit'
+ url = 'config:language:edit'
pk = 1
data = {'short_name': 'dk',
'full_name': 'Dansk'}
@@ -72,7 +72,7 @@ class DeleteLanguageTestCase(WorkoutManagerDeleteTestCase):
'''
object_class = Language
- url = 'config:language-delete'
+ url = 'config:language:delete'
pk = 1
diff --git a/wger/gym/templates/gym/list.html b/wger/gym/templates/gym/list.html
index 8aaa2cc3c..c638e1c57 100644
--- a/wger/gym/templates/gym/list.html
+++ b/wger/gym/templates/gym/list.html
@@ -52,7 +52,7 @@
</button>
<ul class="dropdown-menu" role="menu">
<li>
- <a href="{% url 'config:gymconfig-edit' %}" class="wger-modal-dialog">{% trans "Edit"%}</a>
+ <a href="{% url 'config:gym_config:edit' %}" class="wger-modal-dialog">{% trans "Edit"%}</a>
</li>
</ul>
</div>