Self hosted FLOSS fitness/workout, nutrition and weight tracker
Remove HTML result page for exercises
Roland Geider11b1268d8bf8
diff --git a/wger/exercises/templates/exercise_search.html b/wger/exercises/templates/exercise_search.htmldeleted file mode 100644index d4ef768e5..000000000--- a/wger/exercises/templates/exercise_search.html+++ /dev/null@@ -1,34 +0,0 @@-{% extends "base.html" %}-{% load url from future %}-{% load i18n %}--<!--- Title--->-{% block title %}{% trans "Search results" %}- "{{ search_term }}"{% endblock %}---<!--- Main Content--->-{% block content %}-<form action="{% url 'wger.exercises.views.exercises.search' %}"- method="get"- id="exercise_search_form">- {% csrf_token %}- <input name="term" id="exercise-search">-</form>--<ul>-{% for exercise in exercises %}- <li><a href="{% url 'exercise-view' exercise.id %}">{{ exercise.name }}</a></li>-{% endfor %}-</ul>--{% endblock %}---<!--- Side bar--->-{% block sidebar %}{% endblock %}diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.pyindex 00dbc136b..01d6dd880 100644--- a/wger/exercises/tests/test_exercise.py+++ b/wger/exercises/tests/test_exercise.py@@ -323,34 +323,21 @@ class ExercisesTestCase(WorkoutManagerTestCase):Helper function to test searching for exercises'''- # Search for exercises (1 hit, "Very cool exercise")+ # 1 hit, "Very cool exercise"response = self.client.get(reverse('wger.exercises.views.exercises.search'),{'term': 'cool'})self.assertEqual(response.status_code, 200)- self.assertEqual(len(response.context['exercises']), 1)- self.assertEqual(response.context['exercises'][0].name, 'Very cool exercise')-- # Search for a pending exercise (0 hits, "Pending exercise")- response = self.client.get(reverse('wger.exercises.views.exercises.search'),- {'term': 'Pending'})- self.assertEqual(response.status_code, 200)- self.assertEqual(len(response.context['exercises']), 0)-- kwargs = {'HTTP_X_REQUESTED_WITH': 'XMLHttpRequest'}-- # AJAX-Search for exercises (1 hit, "Very cool exercise")- response = self.client.get(reverse('wger.exercises.views.exercises.search'),- {'term': 'cool'},- **kwargs)- self.assertEqual(response.status_code, 200)result = json.loads(response.content)self.assertEqual(len(result), 1)self.assertEqual(result[0]['value'], 'Very cool exercise')+ self.assertEqual(result[0]['id'], 2)+ self.assertEqual(result[0]['category'], 'Another category')+ self.assertEqual(result[0]['image'], None)+ self.assertEqual(result[0]['image_thumbnail'], None)- # AJAX Search for a pending exercise (0 hits, "Pending exercise")+ # 0 hits, "Pending exercise"response = self.client.get(reverse('wger.exercises.views.exercises.search'),- {'term': 'Pending'},- **kwargs)+ {'term': 'Pending'})self.assertEqual(response.status_code, 200)result = json.loads(response.content)self.assertEqual(len(result), 0)diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.pyindex 28697e6c3..0ebc281ae 100644--- a/wger/exercises/views/exercises.py+++ b/wger/exercises/views/exercises.py@@ -329,42 +329,28 @@ def search(request):.order_by('category__name', 'name').distinct())- # AJAX-request, this comes from the autocompleter. Create a list and send- # it back as JSON- if request.is_ajax():-- results = []- for exercise in exercises:- if exercise.exerciseimage_set.exists():- image_obj = exercise.exerciseimage_set.filter(is_main=True)[0]- image = image_obj.image.url- t = get_thumbnailer(image_obj.image)- thumbnail = t.get_thumbnail(aliases.get('micro_cropped')).url- else:- image = None- thumbnail = None-- exercise_json = {}- exercise_json['id'] = exercise.id- exercise_json['name'] = exercise.name- exercise_json['value'] = exercise.name- exercise_json['category'] = _(exercise.category.name)- exercise_json['image'] = image- exercise_json['image_thumbnail'] = thumbnail-- results.append(exercise_json)- data = json.dumps(results)-- # Return the results to the server- mimetype = 'application/json'- return HttpResponse(data, mimetype)-- # Usual search (perhaps JS disabled), present the results as normal HTML page- else:- template_data = {}- template_data.update(csrf(request))- template_data['exercises'] = exercises- template_data['search_term'] = q- return render_to_response('exercise_search.html',- template_data,- context_instance=RequestContext(request))+ results = []+ for exercise in exercises:+ if exercise.exerciseimage_set.exists():+ image_obj = exercise.exerciseimage_set.filter(is_main=True)[0]+ image = image_obj.image.url+ t = get_thumbnailer(image_obj.image)+ thumbnail = t.get_thumbnail(aliases.get('micro_cropped')).url+ else:+ image = None+ thumbnail = None++ exercise_json = {}+ exercise_json['id'] = exercise.id+ exercise_json['name'] = exercise.name+ exercise_json['value'] = exercise.name+ exercise_json['category'] = _(exercise.category.name)+ exercise_json['image'] = image+ exercise_json['image_thumbnail'] = thumbnail++ results.append(exercise_json)+ data = json.dumps(results)++ # Return the results to the server+ mimetype = 'application/json'+ return HttpResponse(data, mimetype)