Merge branch 'master' into 3016-pipeline-template-search-string

[arvados.git] / 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 bd182d4e889dc8d6902a1b82e4e03e5a696cd2f9..9f2cfb09f3da31ecb6953b5e5a3e915b212d757f 100644 (file)
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -10,6 +10,17 @@ class ActionsController < ApplicationController
     ArvadosBase::resource_class_for_uuid(params[:uuid])
   end
 
+  def show
+    @object = model_class.find(params[:uuid])
+    if @object.is_a? Link and
+        @object.link_class == 'name' and
+        ArvadosBase::resource_class_for_uuid(@object.head_uuid) == Collection
+      redirect_to collection_path(id: @object.uuid)
+    else
+      redirect_to @object
+    end
+  end
+
   def post
     params.keys.collect(&:to_sym).each do |param|
       if @@exposed_actions[param]
@@ -73,10 +84,11 @@ class ActionsController < ApplicationController
   def arv_normalize mt, *opts
     r = ""
     IO.popen(['arv-normalize'] + opts, 'w+b') do |io|
-    io.write mt
-    io.close_write
-    while buf = io.read(2**16)
-      r += buf
+      io.write mt
+      io.close_write
+      while buf = io.read(2**16)
+        r += buf
+      end
     end
     r
   end
@@ -85,7 +97,17 @@ class ActionsController < ApplicationController
     lst = []
     files = []
     params["selection"].each do |s|
-      m = CollectionsHelper.match(s)
+      a = ArvadosBase::resource_class_for_uuid s
+      m = nil
+      if a == Link
+        begin
+          m = CollectionsHelper.match(Link.find(s).head_uuid)
+        rescue
+        end
+      else
+        m = CollectionsHelper.match(s)
+      end
+
       if m and m[1] and m[2]
         lst.append(m[1] + m[2])
         files.append(m)
@@ -117,7 +139,7 @@ class ActionsController < ApplicationController
 
     d = Digest::MD5.new()
     d << normalized_stripped
-    newuuid = "#{d.hexdigest}+#{normalized.length}"
+    newuuid = "#{d.hexdigest}+#{normalized_stripped.length}"
 
     env = Hash[ENV].
       merge({
@@ -131,10 +153,9 @@ class ActionsController < ApplicationController
             })
 
     IO.popen([env, 'arv-put', '--raw'], 'w+b') do |io|
-      io.write normalized
+      io.write normalized_stripped
       io.close_write
-      while buf = io.read(2**20)
-
+      while buf = io.read(2**16)
       end
     end