From 412e78dc1a3725780de6c582a828b5c76a3d98e0 Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Sat, 29 Oct 2016 12:44:30 +0800
Subject: [PATCH] revert search controller and some topic methods

---
 app/controllers/search_controller.rb | 8 ++++----
 app/controllers/topics_controller.rb | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index dc7e6efb..0fb9c808 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -73,7 +73,7 @@ class SearchController < ApplicationController
       @topics = []
     end
 
-    render json: autocomplete_array_json(@topics).as_json
+    render json: autocomplete_array_json(@topics).to_json
   end
 
   # get /search/maps?term=SOMETERM
@@ -107,7 +107,7 @@ class SearchController < ApplicationController
       @maps = []
     end
 
-    render json: autocomplete_map_array_json(@maps).as_json
+    render json: autocomplete_map_array_json(@maps).to_json
   end
 
   # get /search/mappers?term=SOMETERM
@@ -125,7 +125,7 @@ class SearchController < ApplicationController
     else
       @mappers = []
     end
-    render json: autocomplete_user_array_json(@mappers).as_json
+    render json: autocomplete_user_array_json(@mappers).to_json
   end
 
   # get /search/synapses?term=SOMETERM OR
@@ -151,7 +151,7 @@ class SearchController < ApplicationController
     # limit to 5 results
     @synapses = @synapses.to_a.slice(0, 5)
 
-    render json: autocomplete_synapse_array_json(@synapses).as_json
+    render json: autocomplete_synapse_array_json(@synapses).to_json
   end
 
   private
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 844fad99..f6c85120 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -22,7 +22,7 @@ class TopicsController < ApplicationController
     end
     @all= @topics.to_a.concat(@maps.to_a).sort { |a, b| a.name <=> b.name }
     
-    render json: autocomplete_array_json(@all).as_json
+    render json: autocomplete_array_json(@all).to_json
   end
 
   # GET topics/:id
@@ -39,7 +39,7 @@ class TopicsController < ApplicationController
 
         respond_with(@allsynapses, @alltopics, @allcreators, @topic)
       end
-      format.json { render json: @topic.as_json(user: current_user) }
+      format.json { render json: @topic.as_json(user: current_user).to_json }
     end
   end