projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 2882-job-process-stats
[arvados.git]
/
apps
/
workbench
/
config
/
routes.rb
diff --git
a/apps/workbench/config/routes.rb
b/apps/workbench/config/routes.rb
index e8862c24267846a461708d9f43f1162df0e4dbfc..383d4421e2eb0e84e7cd1d14b94ea1e51e739e2a 100644
(file)
--- a/
apps/workbench/config/routes.rb
+++ b/
apps/workbench/config/routes.rb
@@
-2,8
+2,9
@@
ArvadosWorkbench::Application.routes.draw do
themes_for_rails
resources :keep_disks
themes_for_rails
resources :keep_disks
+ resources :keep_services
resources :user_agreements do
resources :user_agreements do
- p
u
t 'sign', on: :collection
+ p
os
t 'sign', on: :collection
get 'signatures', on: :collection
end
get '/user_agreements/signatures' => 'user_agreements#signatures'
get 'signatures', on: :collection
end
get '/user_agreements/signatures' => 'user_agreements#signatures'
@@
-17,9
+18,11
@@
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
- match '/logout' => 'sessions#destroy'
- match '/logged_out' => 'sessions#index'
+ resources :jobs do
+ post 'cancel', :on => :member
+ end
+ match '/logout' => 'sessions#destroy', via: [:get, :post]
+ get '/logged_out' => 'sessions#index'
resources :users do
get 'home', :on => :member
get 'welcome', :on => :collection
resources :users do
get 'home', :on => :member
get 'welcome', :on => :collection
@@
-39,13
+42,20
@@
ArvadosWorkbench::Application.routes.draw do
get 'compare', on: :collection
end
resources :links
get 'compare', on: :collection
end
resources :links
-
match
'/collections/graph' => 'collections#graph'
+
get
'/collections/graph' => 'collections#graph'
resources :collections do
post 'set_persistent', on: :member
resources :collections do
post 'set_persistent', on: :member
+ get 'sharing_popup', :on => :member
+ post 'share', :on => :member
+ post 'unshare', :on => :member
end
end
+ 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 '/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'
end
post 'actions' => 'actions#post'
@@
-55,5
+65,5
@@
ArvadosWorkbench::Application.routes.draw do
# 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)
- match '*a',
:to => 'links#render_not_found'
+ match '*a',
to: 'links#render_not_found', via: [:get, :post]
end
end