Show display URL, not API URL in search results

Author: ptgolden

editorsnotes/main/static/function/all-notes.js

@@ -108,7 +108,7 @@ $(function() {
 
   var $facets = $('#note-facets input');
   $facets.prop('checked', false);
-  $facets.live('click', function() {
+  $facets.on('click', function() {
     var $checked = $('#note-facets input:checked');
     var $sortingOptions = $('.sort-option');
     var queryString = '?filter=1'
@@ -145,13 +145,13 @@ $(function() {
 
 
   // Toggle faceting options
-  $('.facet-title').live('click', function() {
+  $('.facet-title').on('click', function() {
     $(this).find('i').toggleClass('fa-plus fa-minus');
     $('.facets').slideToggle('fast');
   })
 
   // Resort list of notes on click of sort options
-  $('.sort-option').live('click', function() {
+  $('.sort-option').on('click', function() {
     var $thisOption = $(this);
     var $otherOptions = $thisOption.siblings('.sort-option');
 

editorsnotes/main/templates/filtered-documents.html

@@ -51,7 +51,7 @@ <h3>Filters</h3>
     <ul class="unstyled model-list" id="document-list">
     {% for document in documents %}
     <li class="document">
-      <a href="{{ document.url }}">{{ document.description|safe }}</a>
+      <a href="{{ document.display_url }}">{{ document.serialized.description|safe }}</a>
     </li>
     {% endfor %}
     </ul>

editorsnotes/main/templates/filtered-notes.html

@@ -70,8 +70,8 @@ <h6>Topics</h6>
   <div class="span12 row">
     <ul class="unstyled span6" id="note-list-1">
     {% for note in notes %}
-      <li class="note" date-modified="{{ note.last_updated }}">
-        <a href="{{ note.url }}">{{ note.title }}</a>
+      <li class="note" date-modified="{{ note.serialized.last_updated }}">
+        <a href="{{ note.display_url }}">{{ note.display_title }}</a>
       </li>
     {% endfor %}
     </ul>

editorsnotes/main/views/documents.py

@@ -125,8 +125,7 @@ def all_documents(request, project_slug=None):
         o['facets'][facet_label] = [ (f['term'], f['term'], f['count'])
                                      for f in facet_vals['terms'] ]
 
-    o['documents'] = [ d['_source']['serialized'] for d in
-                       executed_query['hits']['hits'] ]
+    o['documents'] = [d['_source'] for d in executed_query['hits']['hits']]
 
     return render_to_response(
         template, o, context_instance=RequestContext(request))

editorsnotes/main/views/notes.py

@@ -125,8 +125,7 @@ def all_notes(request, project_slug=None):
     status_facets = executed_query['facets']['status_facet']['terms']
     o['status_facets'] = status_facets
 
-    o['notes'] = [ n['_source']['serialized'] for n in
-                   executed_query['hits']['hits'] ]
+    o['notes'] = [n['_source'] for n in executed_query['hits']['hits']]
 
     return render_to_response(
         template, o, context_instance=RequestContext(request))

editorsnotes/search/templatetags/render_search_results.py

@@ -43,6 +43,6 @@ def render_search_result(result_dict):
         result_body = u''
 
     return TEMPLATE.format(result_type=result_type.title(),
-                           result_url=serialized['url'],
+                           result_url=result_dict['_source'].get('display_url', serialized['url']),
                            result_display=result_display,
                            result_body=result_body)

editorsnotes/search/types.py

@@ -48,6 +48,7 @@ def get_mapping(self):
         mapping = {
             self.type_label : {
                 'properties': {
+                    'display_url': { 'type': 'string', 'index': 'not_analyzed' },
                     'display_title': {
                         'search_analyzer': 'analyzer_shingle',
                         'index_analyzer': 'analyzer_shingle',
@@ -93,6 +94,7 @@ def data_from_object(self, obj, request=None):
         data = {
             'id': obj.id,
             'serialized': obj._rest_serialized,
+            'display_url': obj.get_absolute_url(),
             'display_title': obj.as_text()
         }
         return data