2809: Merge branch 'master' into 2809-workbench-rails4 refs #2809

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

diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index 508c18542e2d9a0a6f8871e94b8cb4a699d608b5..e0c93ec04bbdcd1fdac748c7c281cd29a168289c 100644 (file)
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -18,8 +18,8 @@ ArvadosWorkbench::Application.routes.draw do
   resources :authorized_keys
   resources :job_tasks
   resources :jobs
-  match '/logout' => 'sessions#destroy'
-  match '/logged_out' => 'sessions#index'
+  match '/logout' => 'sessions#destroy', via: [:get, :post]
+  get '/logged_out' => 'sessions#index'
   resources :users do
     get 'home', :on => :member
     get 'welcome', :on => :collection
@@ -39,9 +39,14 @@ ArvadosWorkbench::Application.routes.draw do
     get 'compare', on: :collection
   end
   resources :links
-  match '/collections/graph' => 'collections#graph'
-  resources :collections
+  get '/collections/graph' => 'collections#graph'
+  resources :collections do
+    post 'set_persistent', on: :member
+  end
   get '/collections/:uuid/*file' => 'collections#show_file', :format => false
+  resources :folders do
+    match 'remove/:item_uuid', on: :member, via: :delete, action: :remove_item
+  end
 
   post 'actions' => 'actions#post'
   get 'websockets' => 'websocket#index'
@@ -50,5 +55,5 @@ ArvadosWorkbench::Application.routes.draw do
 
   # Send unroutable requests to an arbitrary controller
   # (ends up at ApplicationController#render_not_found)
-  match '*a', :to => 'links#render_not_found'
+  match '*a', to: 'links#render_not_found', via: [:get, :post]
 end