projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'main' from workbench2.git
[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 09af60fb9cc5f18a9102d02ed8133e6651f5ecc9..ead2c951c3f8e5fdf41589e4366d96cdc891596e 100644
(file)
--- a/
apps/workbench/app/models/collection.rb
+++ b/
apps/workbench/app/models/collection.rb
@@
-68,8
+68,8
@@
class Collection < ArvadosBase
.sort.flat_map do |parts|
[parts + [nil]] + dir_to_tree.call(File.join(parts))
end
.sort.flat_map do |parts|
[parts + [nil]] + dir_to_tree.call(File.join(parts))
end
- # Then extend that list with files in this directory.
- subnodes + tree[File.split(dirname)]
+ # Then extend that list with files in this directory
, except the empty dir placeholders (0:0:. files)
.
+ subnodes + tree[File.split(dirname)]
.reject { |_, basename, size| (basename == '.') and (size == 0) }
end
dir_to_tree.call('.')
end
end
dir_to_tree.call('.')
end
@@
-86,14
+86,6
@@
class Collection < ArvadosBase
arvados_api_client.api "collections/#{self.uuid}/", "used_by"
end
arvados_api_client.api "collections/#{self.uuid}/", "used_by"
end
- def uuid
- if self[:uuid].nil?
- return self[:portable_data_hash]
- else
- super
- end
- end
-
def friendly_link_name lookup=nil
name || portable_data_hash
end
def friendly_link_name lookup=nil
name || portable_data_hash
end