X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a942e37250873d383bd885ba0dba70c63b3c073d..274ca7a6c2f1f600de4242eee6cb4e8465d4440c:/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 fcca2abe16..347644bdbd 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -112,46 +112,53 @@ class ActionsController < ApplicationController
   end
 
   expose_action :combine_selected_files_into_collection do
-    lst = []
+    uuids = []
+    pdhs = []
     files = []
     params["selection"].each do |s|
       a = ArvadosBase::resource_class_for_uuid s
-      m = nil
       if a == Link
         begin
-          m = CollectionsHelper.match(Link.find(s).head_uuid)
+          if (m = CollectionsHelper.match(Link.find(s).head_uuid))
+            pdhs.append(m[1] + m[2])
+            files.append(m)
+          end
         rescue
         end
-      else
-        m = CollectionsHelper.match(s)
-      end
-
-      if m and m[1] and m[2]
-        lst.append(m[1] + m[2])
+      elsif (m = CollectionsHelper.match(s))
+        pdhs.append(m[1] + m[2])
+        files.append(m)
+      elsif (m = CollectionsHelper.match_uuid_with_optional_filepath(s))
+        uuids.append(m[1])
         files.append(m)
       end
     end
 
-    collections = Collection.where(uuid: lst)
-
+    pdhs = pdhs.uniq
+    uuids = uuids.uniq
     chash = {}
-    collections.each do |c|
-      c.reload()
+
+    Collection.select([:uuid, :manifest_text]).where(uuid: uuids).each do |c|
       chash[c.uuid] = c
     end
 
+    Collection.select([:portable_data_hash, :manifest_text]).where(portable_data_hash: pdhs).each do |c|
+      chash[c.portable_data_hash] = c
+    end
+
     combined = ""
     files.each do |m|
-      mt = chash[m[1]+m[2]].manifest_text
-      if m[4]
+      mt = chash[m[1]+m[2]].andand.manifest_text
+      if not m[4].nil? and m[4].size > 1
         combined += arv_normalize mt, '--extract', m[4][1..-1]
       else
-        combined += chash[m[1]+m[2]].manifest_text
+        combined += mt
       end
     end
 
     normalized = arv_normalize combined
     newc = Collection.new({:manifest_text => normalized})
+    newc.name = newc.name || "Collection created at #{Time.now.localtime}"
     newc.save!
 
     chash.each do |k,v|
@@ -164,7 +171,12 @@ class ActionsController < ApplicationController
       l.save!
     end
 
-    redirect_to controller: 'collections', action: :show, id: newc.uuid
+    action_data = JSON.parse(params['action_data']) if params['action_data']
+    if action_data && action_data['selection_param'].eql?('project')
+      redirect_to :back
+    else
+      redirect_to url_for(controller: 'collections', action: :show, id: newc.uuid)
+    end
   end
 
   def report_issue_popup