X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c7a21e6294f1eb905ace3d717f9dcfb4d4c39f0b..1be91cdf5926f71acba0f7360ab7efbe879f375b:/apps/workbench/app/models/collection.rb

diff --git a/apps/workbench/app/models/collection.rb b/apps/workbench/app/models/collection.rb
index a64f7e1e10..764817509a 100644
--- a/apps/workbench/app/models/collection.rb
+++ b/apps/workbench/app/models/collection.rb
@@ -1,19 +1,25 @@
 class Collection < ArvadosBase
-  include ApplicationHelper
-
   MD5_EMPTY = 'd41d8cd98f00b204e9800998ecf8427e'
 
+  def default_name
+    if Collection.is_empty_blob_locator? self.uuid
+      "Empty Collection"
+    else
+      super
+    end
+  end
+
   # Return true if the given string is the locator of a zero-length blob
   def self.is_empty_blob_locator? locator
     !!locator.to_s.match("^#{MD5_EMPTY}(\\+.*)?\$")
   end
 
-  def self.goes_in_folders?
+  def self.goes_in_projects?
     true
   end
 
   def content_summary
-    human_readable_bytes_html(total_bytes) + " " + super
+    ApplicationController.helpers.human_readable_bytes_html(total_bytes) + " " + super
   end
 
   def total_bytes
@@ -23,10 +29,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|