Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Rename mass email URLs

Roland Geider2fbe65bef7ba
diff --git a/wger/email/templates/email/form.html b/wger/email/templates/email/form.html
index 4126a03a0..a6ed35901 100644
--- a/wger/email/templates/email/form.html
+++ b/wger/email/templates/email/form.html
@@ -12,7 +12,7 @@
{% breadcrumb_raw gym "gym:gym:user-list" gym.pk %}
{% breadcrumb "Emails" "email:email:overview" gym.pk %}
- {% breadcrumb "Add" "email:email:add" gym.pk %}
+ {% breadcrumb "Add" "email:email:add-gym" gym.pk %}
{% endblock %}
{% block content %}
diff --git a/wger/email/templates/email/overview.html b/wger/email/templates/email/overview.html
index 4a2cabcbb..ab5252439 100644
--- a/wger/email/templates/email/overview.html
+++ b/wger/email/templates/email/overview.html
@@ -36,7 +36,7 @@
{% endblock %}
{% block sidebar %}
- <a href="{% url 'email:email:add' gym.pk %}" class="btn btn-success">
+ <a href="{% url 'email:email:add-gym' gym.pk %}" class="btn btn-success">
{% trans "Add" %}
</a>
{% endblock %}
\ No newline at end of file
diff --git a/wger/email/templates/email/preview.html b/wger/email/templates/email/preview.html
index 22a86e5af..ba5838096 100644
--- a/wger/email/templates/email/preview.html
+++ b/wger/email/templates/email/preview.html
@@ -12,7 +12,7 @@
{% endif %}
{% breadcrumb_raw gym "gym:gym:user-list" gym.pk %}
- {% breadcrumb "Emails" "email:email:add" gym.pk %}
+ {% breadcrumb "Emails" "email:email:gym" gym.pk %}
{% endblock %}
diff --git a/wger/email/urls.py b/wger/email/urls.py
index 2f5118919..d3288bbde 100644
--- a/wger/email/urls.py
+++ b/wger/email/urls.py
@@ -17,17 +17,17 @@
from django.conf.urls import url, include
from wger.email.forms import EmailListForm
-from wger.email.views import email_lists
+from wger.email.views import gym
# sub patterns for email lists
patterns_email = [
url(r'^overview/gym/(?P<gym_pk>\d+)$',
- email_lists.EmailLogListView.as_view(),
+ gym.EmailLogListView.as_view(),
name='overview'),
url(r'^add/gym/(?P<gym_pk>\d+)$',
- email_lists.EmailListFormPreview(EmailListForm),
- name='add'),
+ gym.EmailListFormPreview(EmailListForm),
+ name='add-gym'),
]
diff --git a/wger/email/views/email_lists.py b/wger/email/views/gym.py
similarity index 98%
rename from wger/email/views/email_lists.py
rename to wger/email/views/gym.py
index a1e1109ca..eb6629b40 100644
--- a/wger/email/views/email_lists.py
+++ b/wger/email/views/gym.py
@@ -94,7 +94,7 @@ class EmailListFormPreview(FormPreview):
context = super(EmailListFormPreview, self).get_context(request, form)
context['gym'] = self.gym
- context['form_action'] = reverse('email:email:add',
+ context['form_action'] = reverse('email:email:add-gym',
kwargs={'gym_pk': self.gym.pk})
return context
diff --git a/wger/gym/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.html
index 43093687c..e7773c453 100644
--- a/wger/gym/templates/gym/member_list.html
+++ b/wger/gym/templates/gym/member_list.html
@@ -303,7 +303,7 @@ $(document).ready( function () {
<a href="{% url 'email:email:overview' gym.id %}">{% trans "Overview"%}</a>
</li>
<li>
- <a href="{% url 'email:email:add' gym.id %}">{% trans "Add"%}</a>
+ <a href="{% url 'email:email:add-gym' gym.id %}">{% trans "Add"%}</a>
</li>
</ul>
</div>