projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2257-inequality-conditions' into 2290-user-activity
[arvados.git]
/
apps
/
workbench
/
config
/
routes.rb
diff --git
a/apps/workbench/config/routes.rb
b/apps/workbench/config/routes.rb
index 376934e91b8b1835c54866f0b5364eb315c9fa21..0981d2ea37689e7b99635ed8bd1747e4fb409f93 100644
(file)
--- a/
apps/workbench/config/routes.rb
+++ b/
apps/workbench/config/routes.rb
@@
-2,8
+2,10
@@
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'
resources :nodes
resources :humans
get '/user_agreements/signatures' => 'user_agreements#signatures'
resources :nodes
resources :humans
@@
-20,6
+22,7
@@
ArvadosWorkbench::Application.routes.draw do
get 'home', :on => :member
get 'welcome', :on => :collection
get 'activity', :on => :collection
get 'home', :on => :member
get 'welcome', :on => :collection
get 'activity', :on => :collection
+ post 'sudo', :on => :member
end
resources :logs
resources :factory_jobs
end
resources :logs
resources :factory_jobs
@@
-34,6
+37,9
@@
ArvadosWorkbench::Application.routes.draw do
match '/collections/graph' => 'collections#graph'
resources :collections
get '/collections/:uuid/*file' => 'collections#show_file', :format => false
match '/collections/graph' => 'collections#graph'
resources :collections
get '/collections/:uuid/*file' => 'collections#show_file', :format => false
+
+ post 'actions' => 'actions#post'
+
root :to => 'users#welcome'
# Send unroutable requests to an arbitrary controller
root :to => 'users#welcome'
# Send unroutable requests to an arbitrary controller