Merge branch 'master' into 3160-copy-unnamed-pipeline

[arvados.git] / apps / workbench / app / models / collection.rb

diff --git a/apps/workbench/app/models/collection.rb b/apps/workbench/app/models/collection.rb
index 90e53e801bed4bc49ad907997e6206c9dc10209d..008d108fd43ed8a7e0a3abe45cc380492b03ba4b 100644 (file)
--- a/apps/workbench/app/models/collection.rb
+++ b/apps/workbench/app/models/collection.rb
@@ -6,7 +6,7 @@ class Collection < ArvadosBase
     !!locator.to_s.match("^#{MD5_EMPTY}(\\+.*)?\$")
   end
 
-  def self.goes_in_folders?
+  def self.goes_in_projects?
     true
   end
 
@@ -21,10 +21,13 @@ class Collection < ArvadosBase
         tot += file[2]
       end
       tot
+    else
+      0
     end
   end
 
   def files_tree
+    return [] if files.empty?
     tree = files.group_by { |file_spec| File.split(file_spec.first) }
     # Fill in entries for empty directories.
     tree.keys.map { |basedir, _| File.split(basedir) }.each do |splitdir|
@@ -45,7 +48,7 @@ class Collection < ArvadosBase
     dir_to_tree.call('.')
   end
 
-  def attribute_editable?(attr)
+  def attribute_editable? attr, *args
     false
   end