projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2640-folder-api
[arvados.git]
/
apps
/
workbench
/
config
/
routes.rb
diff --git
a/apps/workbench/config/routes.rb
b/apps/workbench/config/routes.rb
index c9bf19b59c73c1341580708c0404e7f41a3ef561..cac3431667a80e0c9437747b8de0eb6cdc9d8c79 100644
(file)
--- a/
apps/workbench/config/routes.rb
+++ b/
apps/workbench/config/routes.rb
@@
-2,9
+2,13
@@
ArvadosWorkbench::Application.routes.draw do
themes_for_rails
resources :keep_disks
themes_for_rails
resources :keep_disks
- resources :user_agreements
- post '/user_agreements/sign' => 'user_agreements#sign'
+ resources :user_agreements do
+ put 'sign', on: :collection
+ get 'signatures', on: :collection
+ end
get '/user_agreements/signatures' => 'user_agreements#signatures'
get '/user_agreements/signatures' => 'user_agreements#signatures'
+ get "users/setup_popup" => 'users#setup_popup', :as => :setup_user_popup
+ get "users/setup" => 'users#setup', :as => :setup_user
resources :nodes
resources :humans
resources :traits
resources :nodes
resources :humans
resources :traits
@@
-19,6
+23,11
@@
ArvadosWorkbench::Application.routes.draw do
resources :users do
get 'home', :on => :member
get 'welcome', :on => :collection
resources :users do
get 'home', :on => :member
get 'welcome', :on => :collection
+ get 'activity', :on => :collection
+ get 'storage', :on => :collection
+ post 'sudo', :on => :member
+ post 'unsetup', :on => :member
+ get 'setup_popup', :on => :member
end
resources :logs
resources :factory_jobs
end
resources :logs
resources :factory_jobs
@@
-26,12
+35,19
@@
ArvadosWorkbench::Application.routes.draw do
resources :groups
resources :specimens
resources :pipeline_templates
resources :groups
resources :specimens
resources :pipeline_templates
- resources :pipeline_instances
- get '/pipeline_instances/compare/*uuid' => 'pipeline_instances#compare'
+ resources :pipeline_instances do
+ get 'compare', on: :collection
+ end
resources :links
match '/collections/graph' => 'collections#graph'
resources :links
match '/collections/graph' => 'collections#graph'
- resources :collections
+ resources :collections do
+ post 'set_persistent', on: :member
+ end
get '/collections/:uuid/*file' => 'collections#show_file', :format => false
get '/collections/:uuid/*file' => 'collections#show_file', :format => false
+
+ post 'actions' => 'actions#post'
+ get 'websockets' => 'websocket#index'
+
root :to => 'users#welcome'
# Send unroutable requests to an arbitrary controller
root :to => 'users#welcome'
# Send unroutable requests to an arbitrary controller