projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2035-arv-mount-tags-folders' into origin-2035-arv-mount-tags-folders
[arvados.git]
/
apps
/
workbench
/
config
/
routes.rb
diff --git
a/apps/workbench/config/routes.rb
b/apps/workbench/config/routes.rb
index fbda8d4ef132eaa64f8bfa8914ae86062763b4bc..e8862c24267846a461708d9f43f1162df0e4dbfc 100644
(file)
--- a/
apps/workbench/config/routes.rb
+++ b/
apps/workbench/config/routes.rb
@@
-7,7
+7,8
@@
ArvadosWorkbench::Application.routes.draw do
get 'signatures', on: :collection
end
get '/user_agreements/signatures' => 'user_agreements#signatures'
get 'signatures', on: :collection
end
get '/user_agreements/signatures' => 'user_agreements#signatures'
- get 'users/setup_popup' => 'users#setup_popup', :as => :setup_popup
+ 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
@@
-23,9
+24,10
@@
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
+ get 'storage', :on => :collection
post 'sudo', :on => :member
post 'sudo', :on => :member
- post 'setup', :on => :member
post 'unsetup', :on => :member
post 'unsetup', :on => :member
+ get 'setup_popup', :on => :member
end
resources :logs
resources :factory_jobs
end
resources :logs
resources :factory_jobs
@@
-38,10
+40,16
@@
ArvadosWorkbench::Application.routes.draw do
end
resources :links
match '/collections/graph' => 'collections#graph'
end
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
+ resources :folders do
+ match 'remove/:item_uuid', on: :member, via: :delete, action: :remove_item
+ end
post 'actions' => 'actions#post'
post 'actions' => 'actions#post'
+ get 'websockets' => 'websocket#index'
root :to => 'users#welcome'
root :to => 'users#welcome'