[ARVADOS] updated: 27e6fc598e6a86e20b6abb2badde3a3b888a44fa

git at public.curoverse.com git at public.curoverse.com
Fri Jul 25 11:12:57 EDT 2014


Summary of changes:
 apps/workbench/app/views/projects/_show_tab_contents.html.erb | 7 ++++---
 apps/workbench/config/routes.rb                               | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

       via  27e6fc598e6a86e20b6abb2badde3a3b888a44fa (commit)
      from  fd2bc65117ee362ccd1c675947d1b941863b7cf7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 27e6fc598e6a86e20b6abb2badde3a3b888a44fa
Author: Tim Pierce <twp at curoverse.com>
Date:   Thu Jul 24 15:01:48 2014 -0400

    2985: use move_selections_into_project action

diff --git a/apps/workbench/app/views/projects/_show_tab_contents.html.erb b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
index 9ac3be0..0f2ad6f 100644
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -21,12 +21,13 @@
                                    title: 'Move to...',
                                    editable: true,
                                    action_name: 'Move',
-                                   action_href: url_for(action: :update),
+                                   action_href: url_for(action: :move_selections_into_project,
+                                                        controller: 'actions'),
                                    action_method: 'patch',
-                                   action_data: {selection_param: @object.resource_param_name+'[owner_uuid]',
+                                   action_data: {selection_param: 'selection[]',
                                                  success: 'page-refresh'}.to_json),
                   'data-remote' => true,
-                  'data-selection-param-name' => 'uuids[]',
+                  'data-selection-param-name' => 'selection[]',
 		  'data-selection-action' => 'move'
             %></li>
         </ul>
diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index 55e2fda..15cd178 100644
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -66,7 +66,7 @@ ArvadosWorkbench::Application.routes.draw do
     get 'choose', on: :collection
     post 'share_with', on: :member
   end
-
+  match '/move_selections_into_project' => 'actions#move_selections_into_project', via: :patch
   post 'actions' => 'actions#post'
   get 'websockets' => 'websocket#index'
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list