From ce45cf9c88eea79e96261e519c80366b1d4a3fa2 Mon Sep 17 00:00:00 2001 From: Victor Rocha Date: Tue, 19 May 2015 18:45:02 -0400 Subject: [PATCH 1/3] [fixes #74] Add descriptions/photo url to search results --- frontend/app/templates/search.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/app/templates/search.html b/frontend/app/templates/search.html index 3df8d0e..c52686d 100644 --- a/frontend/app/templates/search.html +++ b/frontend/app/templates/search.html @@ -28,10 +28,10 @@

{{ school.name }}

Grades {{ school.grade_min }}-{{ school.grade_max }} — {{ school.address }}

- +

Website: {{ school.website_url }}

- The mission of Jordan High School is to provide students with the opportunity to explore a body of knowledge, to develop academic, physical, and social skills, and to practice thinking and decision-making processes in an open and orderly environment. + {{ school.description }}

From 7a73da1f51364bd3d2522c7cdaf968c77bdcf171 Mon Sep 17 00:00:00 2001 From: Victor Rocha Date: Tue, 19 May 2015 18:47:06 -0400 Subject: [PATCH 2/3] [fixes #74] Uses data-ng-src instead of src --- frontend/app/templates/search.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app/templates/search.html b/frontend/app/templates/search.html index c52686d..f8d4f2d 100644 --- a/frontend/app/templates/search.html +++ b/frontend/app/templates/search.html @@ -28,7 +28,7 @@

{{ school.name }}

Grades {{ school.grade_min }}-{{ school.grade_max }} — {{ school.address }}

- +

Website: {{ school.website_url }}

{{ school.description }} From c7f85d15cc5ec27b121d73088be374dfe506b464 Mon Sep 17 00:00:00 2001 From: Victor Rocha Date: Tue, 19 May 2015 19:24:41 -0400 Subject: [PATCH 3/3] [fixes #74] Changes description to mission_statement --- frontend/app/templates/search.html | 2 +- schools/serializers.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/app/templates/search.html b/frontend/app/templates/search.html index f8d4f2d..614203d 100644 --- a/frontend/app/templates/search.html +++ b/frontend/app/templates/search.html @@ -31,7 +31,7 @@

{{ school.name }}

Website: {{ school.website_url }}

- {{ school.description }} + {{ school.mission_statement }}

diff --git a/schools/serializers.py b/schools/serializers.py index 21ba777..1de6015 100644 --- a/schools/serializers.py +++ b/schools/serializers.py @@ -21,7 +21,8 @@ class Meta: model = schools_models.School fields = ('id', 'name', 'level', 'address', 'type', 'eligibility', 'location', 'preference', 'short_name', 'distance', - 'year_round', 'grade_min', 'grade_max', 'website_url') + 'year_round', 'grade_min', 'grade_max', 'website_url', + 'mission_statement',) def get_eligibility(self, obj): pt = self.context['point']