projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2872: Merge branch 'master' into 2872-folder-nav
[arvados.git]
/
apps
/
workbench
/
config
/
routes.rb
diff --git
a/apps/workbench/config/routes.rb
b/apps/workbench/config/routes.rb
index 94e2a115293a86090a484a74b5516a0c6aba7e40..a4f69b36b00eb07c577bcc5d7bfb02f83cf2fa89 100644
(file)
--- a/
apps/workbench/config/routes.rb
+++ b/
apps/workbench/config/routes.rb
@@
-18,7
+18,9
@@
ArvadosWorkbench::Application.routes.draw do
resources :virtual_machines
resources :authorized_keys
resources :job_tasks
resources :virtual_machines
resources :authorized_keys
resources :job_tasks
- resources :jobs
+ resources :jobs do
+ post 'cancel', :on => :member
+ end
match '/logout' => 'sessions#destroy', via: [:get, :post]
get '/logged_out' => 'sessions#index'
resources :users do
match '/logout' => 'sessions#destroy', via: [:get, :post]
get '/logged_out' => 'sessions#index'
resources :users do
@@
-40,6
+42,7
@@
ArvadosWorkbench::Application.routes.draw do
end
resources :pipeline_instances do
get 'compare', on: :collection
end
resources :pipeline_instances do
get 'compare', on: :collection
+ post 'copy', on: :member
end
resources :links
get '/collections/graph' => 'collections#graph'
end
resources :links
get '/collections/graph' => 'collections#graph'
@@
-54,15
+57,16
@@
ArvadosWorkbench::Application.routes.draw do
format: false)
get '/collections/download/:uuid/:reader_token' => 'collections#show_file_links'
get '/collections/:uuid/*file' => 'collections#show_file', :format => false
format: false)
get '/collections/download/:uuid/:reader_token' => 'collections#show_file_links'
get '/collections/:uuid/*file' => 'collections#show_file', :format => false
- resources :
folder
s do
+ resources :
project
s do
match 'remove/:item_uuid', on: :member, via: :delete, action: :remove_item
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
end
post 'actions' => 'actions#post'
get 'websockets' => 'websocket#index'
get 'choose', on: :collection
end
post 'actions' => 'actions#post'
get 'websockets' => 'websocket#index'
- root :to => '
folder
s#index'
+ root :to => '
project
s#index'
# Send unroutable requests to an arbitrary controller
# (ends up at ApplicationController#render_not_found)
# Send unroutable requests to an arbitrary controller
# (ends up at ApplicationController#render_not_found)