projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14287: Don't send reader_tokens="[false]".
[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 305ea015306fe898c97bd16b443a13d9ff230781..ead2c951c3f8e5fdf41589e4366d96cdc891596e 100644
(file)
--- a/
apps/workbench/app/models/collection.rb
+++ b/
apps/workbench/app/models/collection.rb
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
require "arvados/keep"
class Collection < ArvadosBase
require "arvados/keep"
class Collection < ArvadosBase
@@
-64,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
@@
-82,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
@@
-99,6
+95,6
@@
class Collection < ArvadosBase
end
def untrash
end
def untrash
- arvados_api_client.api(self.class, "/#{self.uuid}/untrash", {})
+ arvados_api_client.api(self.class, "/#{self.uuid}/untrash", {
"ensure_unique_name" => true
})
end
end
end
end