projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3138-wiselinks
[arvados.git]
/
apps
/
workbench
/
config
/
routes.rb
diff --git
a/apps/workbench/config/routes.rb
b/apps/workbench/config/routes.rb
index cac3431667a80e0c9437747b8de0eb6cdc9d8c79..55e2fdae364465ef07958d728e9b992b26fffa5a 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,10
+18,13
@@
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
resources :users do
+ get 'choose', :on => :collection
get 'home', :on => :member
get 'welcome', :on => :collection
get 'activity', :on => :collection
get 'home', :on => :member
get 'welcome', :on => :collection
get 'activity', :on => :collection
@@
-32,25
+36,43
@@
ArvadosWorkbench::Application.routes.draw do
resources :logs
resources :factory_jobs
resources :uploaded_datasets
resources :logs
resources :factory_jobs
resources :uploaded_datasets
- resources :groups
+ resources :groups do
+ get 'choose', on: :collection
+ end
resources :specimens
resources :specimens
- resources :pipeline_templates
+ resources :pipeline_templates do
+ get 'choose', on: :collection
+ end
resources :pipeline_instances do
get 'compare', on: :collection
resources :pipeline_instances do
get 'compare', on: :collection
+ post 'copy', on: :member
end
resources :links
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
+ get 'choose', on: :collection
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
get '/collections/:uuid/*file' => 'collections#show_file', :format => false
+ resources :projects 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
post 'actions' => 'actions#post'
get 'websockets' => 'websocket#index'
post 'actions' => 'actions#post'
get 'websockets' => 'websocket#index'
- root :to => '
users#welcome
'
+ root :to => '
projects#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)
- match '*a',
:to => 'links#render_not_found'
+ match '*a',
to: 'links#render_not_found', via: [:get, :post]
end
end