projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14322: Tweak workbench support from manual testing
[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 b5347dce00f24c64a388baac1dd9011935ab99c9..f5aef841ea47a6bfc66e84bccbaa86c617267a3f 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
@@
-35,7
+39,11
@@
class Collection < ArvadosBase
end
def content_summary
end
def content_summary
- ApplicationController.helpers.human_readable_bytes_html(total_bytes) + " " + super
+ if total_bytes > 0
+ ApplicationController.helpers.human_readable_bytes_html(total_bytes) + " " + super
+ else
+ super + " modified at " + modified_at.to_s
+ end
end
def total_bytes
end
def total_bytes
@@
-60,18
+68,14
@@
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
def editable_attributes
end
dir_to_tree.call('.')
end
def editable_attributes
- %w(name description manifest_text)
- end
-
- def self.creatable?
- false
+ %w(name description manifest_text filename)
end
def provenance
end
def provenance
@@
-90,24
+94,15
@@
class Collection < ArvadosBase
end
end
end
end
- def portable_data_hash
- if self[:portable_data_hash].nil?
- return self[:uuid]
- else
- super
- end
- end
-
def friendly_link_name lookup=nil
def friendly_link_name lookup=nil
- if self.respond_to? :name
- self.name
- else
- self.portable_data_hash
- end
+ name || portable_data_hash
end
def textile_attributes
[ 'description' ]
end
end
def textile_attributes
[ 'description' ]
end
+ def untrash
+ arvados_api_client.api(self.class, "/#{self.uuid}/untrash", {"ensure_unique_name" => true})
+ end
end
end