2893: Merge branch 'master' into 2893-no-symbols-in-db

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

diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index 30ac241333a0dcf6dbb90cd6f09fe1b42772dc58..b4da656bc3a42208764c9a7dfc01f1fd14f82f40 100644 (file)
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -4,7 +4,7 @@ ArvadosWorkbench::Application.routes.draw do
   resources :keep_disks
   resources :keep_services
   resources :user_agreements do
-    put 'sign', on: :collection
+    post 'sign', on: :collection
     get 'signatures', on: :collection
   end
   get '/user_agreements/signatures' => 'user_agreements#signatures'
@@ -43,12 +43,17 @@ ArvadosWorkbench::Application.routes.draw do
   get '/collections/graph' => 'collections#graph'
   resources :collections do
     post 'set_persistent', on: :member
+    get 'sharing_popup', :on => :member
+    post 'share', :on => :member
+    post 'unshare', :on => :member
   end
-  get '/collections/:uuid/*file' => 'collections#show_file', :format => false
   get('/collections/download/:uuid/:reader_token/*file' => 'collections#show_file',
       format: false)
+  get '/collections/download/:uuid/:reader_token' => 'collections#show_file_links'
+  get '/collections/:uuid/*file' => 'collections#show_file', :format => false
   resources :folders do
     match 'remove/:item_uuid', on: :member, via: :delete, action: :remove_item
+    get 'choose', on: :collection
   end
 
   post 'actions' => 'actions#post'