Merge branch '11454-wb-federated-search'

[arvados.git] / apps / workbench / app / assets / javascripts / components / search.js

diff --git a/apps/workbench/app/assets/javascripts/components/search.js b/apps/workbench/app/assets/javascripts/components/search.js
index 2f37d781ae9439eed480b5dcacfe713351a030f6..04572ec3cc9ebd82e5ef896d086339337771a431 100644 (file)
--- a/apps/workbench/app/assets/javascripts/components/search.js
+++ b/apps/workbench/app/assets/javascripts/components/search.js
@@ -65,7 +65,7 @@ window.SearchResultsTable = {
                             method: 'GET'
                         }, [
                             tokenParam !== '' &&
-                                m('input[type=hidden][name=api_token][value='+tokenParam+']'),
+                                m('input[type=hidden][name=api_token]', {value: tokenParam}),
                             item.workbenchBaseURL() &&
                                 m('button.btn.btn-xs.btn-default[type=submit]', {
                                     'data-original-title': 'show '+item.objectType.description,
@@ -104,6 +104,7 @@ window.SearchResultsTable = {
 window.Search = {
     oninit: function(vnode) {
         vnode.state.sessionDB = new SessionDB()
+        vnode.state.sessionDB.autoRedirectToHomeCluster('/search')
         vnode.state.searchEntered = m.stream()
         vnode.state.searchActive = m.stream()
         // When searchActive changes (e.g., when restoring state