Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Move language views to core application

Roland Geiderbc1ce6eeb611
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8687d4f13..14c2e748e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -29,7 +29,7 @@ Improvements:
* Remove hard-coded CC licence from documentation and website `#247`_
Other improvements and bugfixes: `#243`_, `#279`_, `#275`_, `#270`_, `#258`_, `#257`_,
-`#269`_, `#296`_, `#297`_
+`#269`_, `#296`_, `#297`_, `#303`_
.. _#78: https://github.com/wger-project/wger/issues/78
@@ -48,6 +48,7 @@ Other improvements and bugfixes: `#243`_, `#279`_, `#275`_, `#270`_, `#258`_, `#
.. _#282: https://github.com/wger-project/wger/issues/282
.. _#296: https://github.com/wger-project/wger/issues/296
.. _#297: https://github.com/wger-project/wger/issues/297
+.. _#303: https://github.com/wger-project/wger/issues/303
.. _@alelevinas: https://github.com/alelevinas
.. _@alokhan: https://github.com/alokhan
diff --git a/wger/config/templates/language/overview.html b/wger/config/templates/language/overview.html
index 2bf84ab54..9b89808f6 100644
--- a/wger/config/templates/language/overview.html
+++ b/wger/config/templates/language/overview.html
@@ -7,12 +7,12 @@
{% block content %}
<div class="list-group">
{% for language in language_list %}
- <a href="{% url 'config:language:view' language.id %}" class="list-group-item">
+ <a href="{% url 'core:language:view' language.id %}" class="list-group-item">
<span class="glyphicon glyphicon-chevron-right pull-right"></span>
{{ language.full_name }}
</a>
{% empty %}
- <a href="{% url 'config:language:add' %}" class="list-group-item">
+ <a href="{% url 'core:language:add' %}" class="list-group-item">
{% trans "Nothing found." %}<br>{% trans "Add one now." %}
</a>
{% endfor %}
@@ -23,7 +23,7 @@
{% block sidebar %}
<p>
- <a href="{% url 'config:language:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
+ <a href="{% url 'core:language:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
{% trans "Add" %}
</a>
</p>
diff --git a/wger/config/templates/language/view.html b/wger/config/templates/language/view.html
index 6ceebc0d9..8a85b71a7 100644
--- a/wger/config/templates/language/view.html
+++ b/wger/config/templates/language/view.html
@@ -8,8 +8,8 @@
{% block breadcrumbs %}
{{ block.super }}
- {% breadcrumb "Languages" "config:language:overview" %}
- {% breadcrumb view_language "config:language:view" view_language.pk %}
+ {% breadcrumb "Languages" "core:language:overview" %}
+ {% breadcrumb view_language "core:language:view" view_language.pk %}
{% endblock %}
@@ -76,7 +76,7 @@ in A).{% endblocktrans %}</p>
<h4>{% trans "Options" %}</h4>
<p>
- <a href="{% url 'config:language:edit' view_language.id %}"
+ <a href="{% url 'core:language:edit' view_language.id %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/edit.svg' %}"
width="32"
@@ -88,7 +88,7 @@ in A).{% endblocktrans %}</p>
</p>
<p>
- <a href="{% url 'config:language:delete' view_language.id %}"
+ <a href="{% url 'core: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/urls.py b/wger/config/urls.py
index 438d53166..2f4df0c60 100644
--- a/wger/config/urls.py
+++ b/wger/config/urls.py
@@ -17,31 +17,10 @@
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
-# sub patterns for languages
-patterns_language = [
- url(r'^list$',
- languages.LanguageListView.as_view(),
- name='overview'),
- url(r'^(?P<pk>\d+)/view$',
- languages.LanguageDetailView.as_view(),
- name='view'),
- url(r'^(?P<pk>\d+)/delete$',
- languages.LanguageDeleteView.as_view(),
- name='delete'),
- url(r'^(?P<pk>\d+)/edit',
- languages.LanguageEditView.as_view(),
- name='edit'),
- url(r'^add$',
- languages.LanguageCreateView.as_view(),
- name='add'),
-]
-
-
# sub patterns for language configs
patterns_language_config = [
url(r'^(?P<pk>\d+)/edit',
@@ -62,7 +41,6 @@ patterns_gym_config = [
# Actual patterns
#
urlpatterns = [
- 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/language_config.py b/wger/config/views/language_config.py
index f42a0e1f8..f4f1825fb 100644
--- a/wger/config/views/language_config.py
+++ b/wger/config/views/language_config.py
@@ -43,7 +43,7 @@ class LanguageConfigUpdateView(WgerFormMixin,
'''
Return to the language page
'''
- return reverse_lazy('config:language:view', kwargs={'pk': self.object.language_id})
+ return reverse_lazy('core:language:view', kwargs={'pk': self.object.language_id})
def get_context_data(self, **kwargs):
context = super(LanguageConfigUpdateView, self).get_context_data(**kwargs)
diff --git a/wger/core/models.py b/wger/core/models.py
index d73ac7446..51a1ffb1e 100644
--- a/wger/core/models.py
+++ b/wger/core/models.py
@@ -66,7 +66,7 @@ class Language(models.Model):
'''
Returns the canonical URL to view a language
'''
- return reverse('config:language:view', kwargs={'pk': self.id})
+ return reverse('core:language:view', kwargs={'pk': self.id})
#
# Own methods
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index ec5c5ab84..187485a10 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -217,7 +217,7 @@
<li class="divider"></li>
<li class="dropdown-header">{% trans "Administration" %}</li>
{% if perms.core.change_language %}
- <li><a href="{% url 'config:language:overview' %}">{% trans "Languages" %} </a></li>
+ <li><a href="{% url 'core: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 d2e2b3bda..be56f563f 100644
--- a/wger/core/tests/test_language.py
+++ b/wger/core/tests/test_language.py
@@ -42,7 +42,7 @@ class LanguageOverviewTest(WorkoutManagerAccessTestCase):
Tests accessing the system's languages
'''
- url = 'config:language:overview'
+ url = 'core:language:overview'
anonymous_fail = True
@@ -51,7 +51,7 @@ class LanguageDetailViewTest(WorkoutManagerAccessTestCase):
Tests accessing a detail view of a language
'''
- url = reverse_lazy('config:language:view', kwargs={'pk': 1})
+ url = reverse_lazy('core:language:view', kwargs={'pk': 1})
anonymous_fail = True
@@ -61,7 +61,7 @@ class CreateLanguageTestCase(WorkoutManagerAddTestCase):
'''
object_class = Language
- url = 'config:language:add'
+ url = 'core:language:add'
data = {'short_name': 'dk',
'full_name': 'Dansk'}
@@ -72,7 +72,7 @@ class EditLanguageTestCase(WorkoutManagerEditTestCase):
'''
object_class = Language
- url = 'config:language:edit'
+ url = 'core:language:edit'
pk = 1
data = {'short_name': 'dk',
'full_name': 'Dansk'}
@@ -84,7 +84,7 @@ class DeleteLanguageTestCase(WorkoutManagerDeleteTestCase):
'''
object_class = Language
- url = 'config:language:delete'
+ url = 'core:language:delete'
pk = 1
diff --git a/wger/core/urls.py b/wger/core/urls.py
index 4e27774f2..532b70d2b 100644
--- a/wger/core/urls.py
+++ b/wger/core/urls.py
@@ -28,10 +28,30 @@ from wger.core.views import (
user,
misc,
license,
+ languages,
repetition_units,
weight_units
)
+# sub patterns for languages
+patterns_language = [
+ url(r'^list$',
+ languages.LanguageListView.as_view(),
+ name='overview'),
+ url(r'^(?P<pk>\d+)/view$',
+ languages.LanguageDetailView.as_view(),
+ name='view'),
+ url(r'^(?P<pk>\d+)/delete$',
+ languages.LanguageDeleteView.as_view(),
+ name='delete'),
+ url(r'^(?P<pk>\d+)/edit',
+ languages.LanguageEditView.as_view(),
+ name='edit'),
+ url(r'^add$',
+ languages.LanguageCreateView.as_view(),
+ name='add'),
+]
+
# sub patterns for user
patterns_user = [
url(r'^login$',
@@ -181,6 +201,7 @@ urlpatterns = [
misc.FeedbackClass.as_view(),
name='feedback'),
+ url(r'^language/', include(patterns_language, namespace="language")),
url(r'^user/', include(patterns_user, namespace="user")),
url(r'^license/', include(patterns_license, namespace="license")),
url(r'^repetition-unit/', include(patterns_repetition_units, namespace="repetition-unit")),
diff --git a/wger/config/views/languages.py b/wger/core/views/languages.py
similarity index 92%
rename from wger/config/views/languages.py
rename to wger/core/views/languages.py
index fd58b18c4..8f24cff9c 100644
--- a/wger/config/views/languages.py
+++ b/wger/core/views/languages.py
@@ -64,7 +64,7 @@ class LanguageCreateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMi
model = Language
fields = '__all__'
title = ugettext_lazy('Add')
- form_action = reverse_lazy('config:language:add')
+ form_action = reverse_lazy('core:language:add')
permission_required = 'core.add_language'
@@ -75,7 +75,7 @@ class LanguageDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequired
model = Language
fields = '__all__'
- success_url = reverse_lazy('config:language:overview')
+ success_url = reverse_lazy('core:language:overview')
messages = ugettext_lazy('Successfully deleted')
permission_required = 'core.delete_language'
@@ -86,7 +86,7 @@ class LanguageDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequired
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('core:language:delete', kwargs={'pk': self.object.id})
return context
@@ -98,7 +98,7 @@ class LanguageEditView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixi
model = Language
fields = '__all__'
- form_action_urlname = 'config:language:edit'
+ form_action_urlname = 'core:language:edit'
permission_required = 'core.change_language'
def get_context_data(self, **kwargs):