Revert changes in the search api

Author: stsewd

readthedocs/core/static-src/core/js/doc-embed/search.js

@@ -38,9 +38,10 @@ function attach_elastic_search_query(data) {
                         var list_item = $('<li style="display: none;"></li>');
 
                         // Creating the result from elements
-                        var url = doc.url + '?highlight=' + $.urlencode(query);
+                        var link = doc.link + DOCUMENTATION_OPTIONS.FILE_SUFFIX +
+                                   '?highlight=' + $.urlencode(query);
 
-                        var item = $('<a>', {'href': url});
+                        var item = $('<a>', {'href': link});
                         item.html(doc.title);
                         list_item.append(item);
 

readthedocs/search/api.py

@@ -1,5 +1,4 @@
 import logging
-import os
 from pprint import pformat
 
 from rest_framework import generics, serializers
@@ -24,33 +23,15 @@ class PageSearchSerializer(serializers.Serializer):
     version = serializers.CharField()
     title = serializers.CharField()
     path = serializers.CharField()
-    # Doc url without extension
     link = serializers.SerializerMethodField()
-    # Doc url with extension
-    url = serializers.SerializerMethodField()
     highlight = serializers.SerializerMethodField()
 
     def get_link(self, obj):
-        """
-        Gets the url without extension.
-
-        .. warning::
-           This is only used to keep compatibility with
-           the previous search implementation.
-           Use `url` instead.
-        """
         projects_url = self.context.get('projects_url')
         if projects_url:
             docs_url = projects_url[obj.project]
             return docs_url + obj.path
 
-    def get_url(self, obj):
-        """Gets the full url."""
-        projects_url = self.context.get('projects_url')
-        if projects_url:
-            docs_url = projects_url[obj.project]
-            return docs_url + obj.full_path
-
     def get_highlight(self, obj):
         highlight = getattr(obj.meta, 'highlight', None)
         if highlight:

readthedocs/templates/search/elastic_search.html

@@ -210,7 +210,7 @@ <h3>
 
                       {% elif 'page' in result.meta.index %}
 
-                        <a href="{% doc_url result.project|get_project result.version result.path %}?highlight={{ query }}">
+                        <a href="{% doc_url result.project|get_project result.version result.full_path %}?highlight={{ query }}">
                           {{ result.project }} - {{ result.title }}
                         </a>
                         {% for fragment in result.meta.highlight.content %}