projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3296: profile notification email setting is now on server
[arvados.git]
/
apps
/
workbench
/
config
/
routes.rb
diff --git
a/apps/workbench/config/routes.rb
b/apps/workbench/config/routes.rb
index 971b0ce7307c0ee6fc8dd6443fe4bff966aa891f..4ef26612ab194a2df62eefa3945aa1ab75ab5c4e 100644
(file)
--- a/
apps/workbench/config/routes.rb
+++ b/
apps/workbench/config/routes.rb
@@
-18,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
+ resources :jobs do
+ post 'cancel', :on => :member
+ end
match '/logout' => 'sessions#destroy', via: [:get, :post]
get '/logged_out' => 'sessions#index'
resources :users do
match '/logout' => 'sessions#destroy', via: [:get, :post]
get '/logged_out' => 'sessions#index'
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
@@
-29,11
+32,17
@@
ArvadosWorkbench::Application.routes.draw do
post 'sudo', :on => :member
post 'unsetup', :on => :member
get 'setup_popup', :on => :member
post 'sudo', :on => :member
post 'unsetup', :on => :member
get 'setup_popup', :on => :member
+ get 'profile', :on => :member
end
end
+ get '/manage_account' => 'users#manage_account'
+ get "/add_ssh_key_popup" => 'users#add_ssh_key_popup', :as => :add_ssh_key_popup
+ get "/add_ssh_key" => 'users#add_ssh_key', :as => :add_ssh_key
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 :pipeline_templates do
get 'choose', on: :collection
resources :specimens
resources :pipeline_templates do
get 'choose', on: :collection
@@
-55,15
+64,22
@@
ArvadosWorkbench::Application.routes.draw do
format: false)
get '/collections/download/:uuid/:reader_token' => 'collections#show_file_links'
get '/collections/:uuid/*file' => 'collections#show_file', :format => false
format: false)
get '/collections/download/:uuid/:reader_token' => 'collections#show_file_links'
get '/collections/:uuid/*file' => 'collections#show_file', :format => false
- resources :
folder
s do
+ resources :
project
s do
match 'remove/:item_uuid', on: :member, via: :delete, action: :remove_item
match 'remove/:item_uuid', on: :member, via: :delete, action: :remove_item
+ match 'remove_items', on: :member, via: :delete, action: :remove_items
+ get 'move_items', on: :member, action: :move_items
get 'choose', on: :collection
get 'choose', on: :collection
+ post 'share_with', on: :member
+ end
+ resources :search do
+ get 'choose', :on => :collection
end
post 'actions' => 'actions#post'
end
post 'actions' => 'actions#post'
+ get 'actions' => 'actions#show'
get 'websockets' => 'websocket#index'
get 'websockets' => 'websocket#index'
- root :to => '
folder
s#index'
+ root :to => '
project
s#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)