From db3cf0490fb391d1a94d62232b1f9534ad53863d Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Thu, 29 Sep 2016 08:02:25 +0800
Subject: [PATCH] fix develop branch bugs (#679)

* bugfix - rename SearchController so it works

* remove unneeded respond_with

* fix to_json calls
---
 app/controllers/maps_controller.rb   |  3 ---
 app/controllers/search_controller.rb | 10 +++++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index b24f85fc..8d4c6e27 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -19,9 +19,6 @@ class MapsController < ApplicationController
         @allmappings = policy_scope(@map.mappings)
         @allmessages = @map.messages.sort_by(&:created_at)
         @allstars = @map.stars
-
-        respond_with(@allmappers, @allcollaborators, @allmappings, @allsynapses,
-                     @alltopics, @allmessages, @allstars, @map)
       end
       format.json { render json: @map }
       format.csv { redirect_to action: :export, format: :csv }
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 91b0b44d..0fb9c808 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class MainController < ApplicationController
+class SearchController < ApplicationController
   include TopicsHelper
   include MapsHelper
   include UsersHelper
@@ -73,7 +73,7 @@ class MainController < ApplicationController
       @topics = []
     end
 
-    render json: autocomplete_array_json(@topics)
+    render json: autocomplete_array_json(@topics).to_json
   end
 
   # get /search/maps?term=SOMETERM
@@ -107,7 +107,7 @@ class MainController < ApplicationController
       @maps = []
     end
 
-    render json: autocomplete_map_array_json(@maps)
+    render json: autocomplete_map_array_json(@maps).to_json
   end
 
   # get /search/mappers?term=SOMETERM
@@ -125,7 +125,7 @@ class MainController < ApplicationController
     else
       @mappers = []
     end
-    render json: autocomplete_user_array_json(@mappers)
+    render json: autocomplete_user_array_json(@mappers).to_json
   end
 
   # get /search/synapses?term=SOMETERM OR
@@ -151,7 +151,7 @@ class MainController < ApplicationController
     # limit to 5 results
     @synapses = @synapses.to_a.slice(0, 5)
 
-    render json: autocomplete_synapse_array_json(@synapses)
+    render json: autocomplete_synapse_array_json(@synapses).to_json
   end
 
   private