X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/656769b7b36b38c564f7da64b275d8831d7a442e..783343e5aca00f730315d943cecf74e4277a38e7:/apps/workbench/app/models/collection.rb diff --git a/apps/workbench/app/models/collection.rb b/apps/workbench/app/models/collection.rb index a64f7e1e10..008d108fd4 100644 --- a/apps/workbench/app/models/collection.rb +++ b/apps/workbench/app/models/collection.rb @@ -1,6 +1,4 @@ class Collection < ArvadosBase - include ApplicationHelper - MD5_EMPTY = 'd41d8cd98f00b204e9800998ecf8427e' # Return true if the given string is the locator of a zero-length blob @@ -8,12 +6,12 @@ class Collection < ArvadosBase !!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 +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|