some post-merge problems

client/galaxy/scripts/galaxy.workflows.js

@@ -31,7 +31,7 @@ $( function() {
             }
             // Start a new ajax-request in X ms
             $("#search-spinner").show();
-            var tool_search_url = galaxy_config.root + 'api/tools/search';
+            var tool_search_url = galaxy_config.root + 'api/tools';
             this.timer = setTimeout(function () {
                 $.get(tool_search_url, { q: q }, function (data) {
                     // input.removeClass(config.loadingClass);

client/galaxy/scripts/mvc/tools.js

@@ -359,7 +359,7 @@ var ToolSearch = Backbone.Model.extend({
         clear_key: 27
     },
 
-    urlRoot: galaxy_config.root + 'api/tools/search',
+    urlRoot: galaxy_config.root + 'api/tools',
 
     initialize: function() {
         this.on("change:query", this.do_search);
@@ -392,7 +392,7 @@ var ToolSearch = Backbone.Model.extend({
             if ( typeof ga !== 'undefined' ) {
                 ga( 'send', 'pageview', galaxy_config.root + '?q=' + q );
             }
-            $.get(self.attributes.search_url, { query: q }, function (data) {
+            $.get( self.urlRoot, { q: q }, function (data) {
                 self.set("results", data);
                 $("#search-spinner").hide();
                 $("#search-clear-btn").show();

lib/galaxy/webapps/galaxy/api/tools.py

@@ -68,7 +68,7 @@ class ToolsController( BaseAPIController, UsesVisualizationMixin ):
                 for hit in hits:
                     tool = self._get_tool( hit )
                     if tool:
-                        results.append( tool.to_dict( trans ) )
+                        results.append( tool.id )
             return results
 
         # Find whether to detect.

static/scripts/galaxy.workflows.js

@@ -31,7 +31,7 @@ $( function() {
             }
             // Start a new ajax-request in X ms
             $("#search-spinner").show();
-            var tool_search_url = galaxy_config.root + 'api/tools/search';
+            var tool_search_url = galaxy_config.root + 'api/tools';
             this.timer = setTimeout(function () {
                 $.get(tool_search_url, { q: q }, function (data) {
                     // input.removeClass(config.loadingClass);

static/scripts/mvc/tools.js

@@ -359,7 +359,7 @@ var ToolSearch = Backbone.Model.extend({
         clear_key: 27
     },
 
-    urlRoot: galaxy_config.root + 'api/tools/search',
+    urlRoot: galaxy_config.root + 'api/tools',
 
     initialize: function() {
         this.on("change:query", this.do_search);
@@ -392,7 +392,7 @@ var ToolSearch = Backbone.Model.extend({
             if ( typeof ga !== 'undefined' ) {
                 ga( 'send', 'pageview', galaxy_config.root + '?q=' + q );
             }
-            $.get(self.attributes.search_url, { query: q }, function (data) {
+            $.get( self.urlRoot, { q: q }, function (data) {
                 self.set("results", data);
                 $("#search-spinner").hide();
                 $("#search-clear-btn").show();