X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ff7803d40cbfbf47a348d4e4eec7d6e48742bbeb..dca6cfe9750d8d1be4f3b63895b8cb73cc6c4cfe:/apps/workbench/app/controllers/actions_controller.rb

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index c443c2196e..8a817f03cd 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -1,10 +1,13 @@
 class ActionsController < ApplicationController
+
+  skip_before_filter :find_object_by_uuid, only: :post
+
   def combine_selected_files_into_collection
     lst = []
     files = []
     params["selection"].each do |s|
       m = CollectionsHelper.match(s)
-      if m[1] and m[2]
+      if m and m[1] and m[2]
         lst.append(m[1] + m[2])
         files.append(m)
       end
@@ -73,9 +76,7 @@ class ActionsController < ApplicationController
 
     chash.each do |k,v|
       l = Link.new({
-                     tail_kind: "arvados#Collection",
                      tail_uuid: k,
-                     head_kind: "arvados#Collection", 
                      head_uuid: newuuid,
                      link_class: "provenance",
                      name: "provided"
@@ -83,12 +84,12 @@ class ActionsController < ApplicationController
       l.save!
     end
 
-    '/collections/' + newc.uuid
+    redirect_to controller: 'collections', action: :show, id: newc.uuid
   end
 
   def post
     if params["combine_selected_files_into_collection"]
-      redirect_to combine_selected_files_into_collection
+      combine_selected_files_into_collection
     else
       redirect_to :back
     end