Merge branch '2659-anonymous-share-projects' refs #2659

[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 34e4663d160fadef9caec921506bd8e4a4f944b5..59dcbb92bb9c57db69fc15277233a0072fd73dac 100644 (file)
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -150,7 +150,7 @@ class ActionsController < ApplicationController
     files.each do |m|
       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]
+        combined += arv_normalize mt, '--extract', ".#{m[4]}"
       else
         combined += mt
       end
@@ -164,8 +164,8 @@ class ActionsController < ApplicationController
     current_project_writable = false
     action_data = JSON.parse(params['action_data']) if params['action_data']
     if action_data && action_data['current_project_uuid']
-      current_project = Group.find(action_data['current_project_uuid'])
-      if (current_project.andand.writable_by.include?(current_user.uuid) rescue nil)
+      current_project = Group.find(action_data['current_project_uuid']) rescue nil
+      if (current_project && current_project.writable_by.andand.include?(current_user.uuid))
         newc.owner_uuid = action_data['current_project_uuid']
         current_project_writable = true
       end