Merge branch 'master' into 3112-report-bug

[arvados.git] / apps / workbench / config / routes.rb

diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index ab5288b000f560ea6c6a19682eaa5970fe4a64c2..e58796e40ccf1ee7988cb06bb7caea8b2b1e6e33 100644 (file)
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -10,6 +10,8 @@ ArvadosWorkbench::Application.routes.draw do
   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
+  get "report_issue_popup" => 'actions#report_issue_popup', :as => :report_issue_popup
+  post "report_issue" => 'actions#report_issue', :as => :report_issue
   resources :nodes
   resources :humans
   resources :traits
@@ -27,11 +29,13 @@ ArvadosWorkbench::Application.routes.draw do
     get 'choose', :on => :collection
     get 'home', :on => :member
     get 'welcome', :on => :collection
+    get 'inactive', :on => :collection
     get 'activity', :on => :collection
     get 'storage', :on => :collection
     post 'sudo', :on => :member
     post 'unsetup', :on => :member
     get 'setup_popup', :on => :member
+    get 'profile', :on => :member
   end
   get '/manage_account' => 'users#manage_account'
   get "/add_ssh_key_popup" => 'users#add_ssh_key_popup', :as => :add_ssh_key_popup
@@ -66,11 +70,16 @@ ArvadosWorkbench::Application.routes.draw do
   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 'move_items', on: :member, action: :move_items
     get 'choose', on: :collection
     post 'share_with', on: :member
   end
+  resources :search do
+    get 'choose', :on => :collection
+  end
 
   post 'actions' => 'actions#post'
+  get 'actions' => 'actions#show'
   get 'websockets' => 'websocket#index'
 
   root :to => 'projects#index'