[ARVADOS] updated: 1.1.0-143-g9ea1f79

[Git user]

Summary of changes:
 apps/workbench/app/assets/javascripts/components/sessions.js       | 2 +-
 apps/workbench/app/controllers/collections_controller.rb           | 7 +------
 apps/workbench/app/controllers/multisite_controller.rb             | 7 -------
 apps/workbench/app/controllers/search_controller.rb                | 2 ++
 apps/workbench/app/views/layouts/body.html.erb                     | 2 +-
 .../app/views/{multisite/search.html => search/index.html}         | 0
 apps/workbench/config/routes.rb                                    | 4 +---
 7 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 apps/workbench/app/controllers/multisite_controller.rb
 rename apps/workbench/app/views/{multisite/search.html => search/index.html} (100%)

       via  9ea1f795a9c4050d8f01cd2f130a3c6c3ea1fd69 (commit)
      from  d4de94839e7aabf550686ef3db9d43254ff2e4d7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 9ea1f795a9c4050d8f01cd2f130a3c6c3ea1fd69
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Nov 21 09:15:56 2017 -0500

    12519: Move multisite search page to /search
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/apps/workbench/app/assets/javascripts/components/sessions.js b/apps/workbench/app/assets/javascripts/components/sessions.js
index 3cacc0a..e7cc505 100644
--- a/apps/workbench/app/assets/javascripts/components/sessions.js
+++ b/apps/workbench/app/assets/javascripts/components/sessions.js
@@ -21,7 +21,7 @@ window.SessionsTable = {
         return m('.container', [
             m('p', [
                 'You can log in to multiple Arvados sites here, then use the ',
-                m('a[href="/multisite"]', 'multi-site search'),
+                m('a[href="/search"]', 'multi-site search'),
                 ' page to search collections and projects on all sites at once.',
             ]),
             m('table.table.table-condensed.table-hover', [
diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 1a69f91..5fcb2dc 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -16,7 +16,7 @@ class CollectionsController < ApplicationController
   skip_around_filter(:require_thread_api_token,
                      only: [:show_file, :show_file_links])
   skip_before_filter(:find_object_by_uuid,
-                     only: [:provenance, :show_file, :show_file_links, :multisite])
+                     only: [:provenance, :show_file, :show_file_links])
   # We depend on show_file to display the user agreement:
   skip_before_filter :check_user_agreements, only: :show_file
   skip_before_filter :check_user_profile, only: :show_file
@@ -324,11 +324,6 @@ class CollectionsController < ApplicationController
     end
   end
 
-  def multisite
-    # Legacy URL, redirect to new one.
-    redirect_to multisite_path
-  end
-
   protected
 
   def find_usable_token(token_list)
diff --git a/apps/workbench/app/controllers/multisite_controller.rb b/apps/workbench/app/controllers/multisite_controller.rb
deleted file mode 100644
index c221c6b..0000000
--- a/apps/workbench/app/controllers/multisite_controller.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: AGPL-3.0
-
-class MultisiteController < ApplicationController
-  skip_before_filter :find_object_by_uuid
-end
diff --git a/apps/workbench/app/controllers/search_controller.rb b/apps/workbench/app/controllers/search_controller.rb
index 40e484e..3775abd 100644
--- a/apps/workbench/app/controllers/search_controller.rb
+++ b/apps/workbench/app/controllers/search_controller.rb
@@ -3,6 +3,8 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 class SearchController < ApplicationController
+  skip_before_filter :ensure_arvados_api_exists
+
   def find_objects_for_index
     search_what = Group
     if params[:project_uuid]
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 9c3e3e9..c1399f2 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -34,7 +34,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
                     <%=
                        target = Rails.configuration.multi_site_search
                        if target == true
-                         target = {controller: 'multisite', action: 'search'}
+                         target = {controller: 'search', action: 'index'}
                        end
                        link_to("Multi-site search", target, {class: 'btn btn-default'}) %>
                   </form>
diff --git a/apps/workbench/app/views/multisite/search.html b/apps/workbench/app/views/search/index.html
similarity index 100%
rename from apps/workbench/app/views/multisite/search.html
rename to apps/workbench/app/views/search/index.html
diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index 777d978..d969abd 100644
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -95,7 +95,7 @@ ArvadosWorkbench::Application.routes.draw do
     post 'remove_selected_files', on: :member
     get 'tags', on: :member
     post 'save_tags', on: :member
-    get 'multisite', on: :collection
+    get 'multisite', on: :collection, to: redirect('/search')
   end
   get('/collections/download/:uuid/:reader_token/*file' => 'collections#show_file',
       format: false)
@@ -132,8 +132,6 @@ ArvadosWorkbench::Application.routes.draw do
 
   get '/tests/mithril', to: 'tests#mithril'
   
-  get '/multisite', to: 'multisite#search'
-
   get '/status', to: 'status#status'
   
   # Send unroutable requests to an arbitrary controller

-----------------------------------------------------------------------


hooks/post-receive
--