Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix some of the URL patterns

Roland Geider589ac3ea5ab7
diff --git a/wger/core/tests/api_base_test.py b/wger/core/tests/api_base_test.py
index b4f5352f6..3e6e8e365 100644
--- a/wger/core/tests/api_base_test.py
+++ b/wger/core/tests/api_base_test.py
@@ -113,7 +113,6 @@ class ApiGetTestCase(object):
Tests accessing the detail view of a resource
'''
- # TODO: why does this sometimes redirect to '/en/api/...' ?!?!
if self.private_resource:
response = self.client.get(self.url_detail)
@@ -122,15 +121,11 @@ class ApiGetTestCase(object):
# Logged in owner user
self.get_credentials()
response = self.client.get(self.url_detail)
- if response.status_code == 302:
- response = self.client.get(response.url)
self.assertEqual(response.status_code, status.HTTP_200_OK)
# Different logged in user
self.get_credentials(self.user_fail)
response = self.client.get(self.url_detail)
- if response.status_code == 302:
- response = self.client.get(response.url)
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
else:
@@ -172,8 +167,6 @@ class ApiGetTestCase(object):
# Different logged in user
self.get_credentials(self.user_fail)
response = self.client.get(self.url_detail)
- if response.status_code == 302:
- response = self.client.get(response.url)
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
@@ -306,8 +299,6 @@ class ApiPatchTestCase(object):
# Different logged in user
self.get_credentials(self.user_fail)
response = self.client.patch(self.url_detail, data=self.data)
- if response.status_code == 302:
- response = self.client.patch(response.url, data=self.data)
self.assertIn(response.status_code,
(status.HTTP_403_FORBIDDEN, status.HTTP_404_NOT_FOUND))
else:
@@ -486,8 +477,6 @@ class ApiDeleteTestCase(object):
# Different logged in user
self.get_credentials(self.user_fail)
response = self.client.delete(self.url_detail)
- if response.status_code == 302:
- response = self.client.delete(response.url)
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
else:
diff --git a/wger/exercises/templates/equipment/overview.html b/wger/exercises/templates/equipment/overview.html
index e45718979..6ebff5c7e 100644
--- a/wger/exercises/templates/equipment/overview.html
+++ b/wger/exercises/templates/equipment/overview.html
@@ -21,7 +21,7 @@
$(function() {
// Init the autocompleter
$("#exercise-search").catcomplete({
- source: "{% url 'wger.exercises.views.exercises.search' %}",
+ source: "{% url 'exercise-search' %}",
minLength: 2,
select: function(event, ui) {
@@ -130,7 +130,7 @@ $(function() {
<h3>{% trans "Search" %}</h3>
<div class="ui-widget">
- <form action="{% url 'wger.exercises.views.exercises.search' %}"
+ <form action="{% url 'exercise-search' %}"
method="get"
id="exercise_search_form">
{% csrf_token %}
diff --git a/wger/exercises/templates/exercise/overview.html b/wger/exercises/templates/exercise/overview.html
index 8c92b355c..39022b947 100644
--- a/wger/exercises/templates/exercise/overview.html
+++ b/wger/exercises/templates/exercise/overview.html
@@ -40,7 +40,7 @@ $(document).ready(function() {
// Init the autocompleter
$("#exercise-search").catcomplete({
- source: "/api/v2/exercise/search/",
+ source: "{% url 'exercise-search' %}",
minLength: 2,
select: function(event, ui) {
@@ -195,7 +195,7 @@ $(document).ready(function() {
<h3>{% trans "Search" %}</h3>
<div class="ui-widget">
- <form action="/api/v2/exercise/search/"
+ <form action="{% url 'exercise-search' %}"
method="get"
id="exercise_search_form">
{% csrf_token %}
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index 84c7b9ba6..23cf85911 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -330,7 +330,7 @@ class ExercisesTestCase(WorkoutManagerTestCase):
'''
# 1 hit, "Very cool exercise"
- response = self.client.get('/api/v2/exercise/search/',
+ response = self.client.get(reverse('exercise-search'),
{'term': 'cool'})
self.assertEqual(response.status_code, 200)
result = json.loads(response.content)
@@ -342,7 +342,7 @@ class ExercisesTestCase(WorkoutManagerTestCase):
self.assertEqual(result[0]['image_thumbnail'], None)
# 0 hits, "Pending exercise"
- response = self.client.get('/api/v2/exercise/search/',
+ response = self.client.get(reverse('exercise-search'),
{'term': 'Pending'})
self.assertEqual(response.status_code, 200)
result = json.loads(response.content)
diff --git a/wger/urls.py b/wger/urls.py
index 9292e784a..0777f90d3 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -157,9 +157,11 @@ urlpatterns = urlpatterns + patterns('',
# API
url(r'^api/', include(v1_api.urls)),
- url(r'^api/v2/exercise/search/', exercises_api_views.search),
- url(r'^api/v2/ingredient/search/',
+ url(r'^api/v2/exercise/search/$',
+ exercises_api_views.search,
+ name='exercise-search'),
+ url(r'^api/v2/ingredient/search/$',
nutrition_api_views.search,
name='ingredient-search'),
- url(r'api/v2/', include(router.urls)),
+ url(r'^api/v2/', include(router.urls)),
)