Merge branch 'master' into 3219-further-docker-improvements

[arvados.git] / apps / workbench / config / routes.rb

diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index a4f69b36b00eb07c577bcc5d7bfb02f83cf2fa89..fe6200bda8edb5e1ace1dab3551dcf13f04164f9 100644 (file)
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -24,6 +24,7 @@ ArvadosWorkbench::Application.routes.draw do
   match '/logout' => 'sessions#destroy', via: [:get, :post]
   get '/logged_out' => 'sessions#index'
   resources :users do
+    get 'choose', :on => :collection
     get 'home', :on => :member
     get 'welcome', :on => :collection
     get 'activity', :on => :collection
@@ -35,7 +36,9 @@ ArvadosWorkbench::Application.routes.draw do
   resources :logs
   resources :factory_jobs
   resources :uploaded_datasets
-  resources :groups
+  resources :groups do
+    get 'choose', on: :collection
+  end
   resources :specimens
   resources :pipeline_templates do
     get 'choose', on: :collection
@@ -61,9 +64,14 @@ ArvadosWorkbench::Application.routes.draw do
     match 'remove/:item_uuid', on: :member, via: :delete, action: :remove_item
     match 'remove_items', on: :member, via: :delete, action: :remove_items
     get 'choose', on: :collection
+    post 'share_with', on: :member
+  end
+  resources :search do
+    get 'choose', :on => :collection
   end
 
   post 'actions' => 'actions#post'
+  get 'actions' => 'actions#show'
   get 'websockets' => 'websocket#index'
 
   root :to => 'projects#index'