projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '12902-queued-to-cancelled'
[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 87a083e24be4ee62d3e52cc5336bb6516ef2d5b2..09af60fb9cc5f18a9102d02ed8133e6651f5ecc9 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
@@
-66,16
+74,8
@@
class Collection < ArvadosBase
dir_to_tree.call('.')
end
dir_to_tree.call('.')
end
- def attribute_editable? attr, *args
- if %w(name description manifest_text).include? attr.to_s
- true
- else
- super
- end
- end
-
- def self.creatable?
- false
+ def editable_attributes
+ %w(name description manifest_text filename)
end
def provenance
end
def provenance
@@
-94,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