projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3821: added 'Remove selected files' to collection#show page.
[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..13f5357faadba842e57bbc24b1bdc883509ed7f6 100644
(file)
--- a/
apps/workbench/app/models/collection.rb
+++ b/
apps/workbench/app/models/collection.rb
@@
-35,7
+35,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
@@
-70,10
+74,6
@@
class Collection < ArvadosBase
%w(name description manifest_text)
end
%w(name description manifest_text)
end
- def self.creatable?
- false
- end
-
def provenance
arvados_api_client.api "collections/#{self.uuid}/", "provenance"
end
def provenance
arvados_api_client.api "collections/#{self.uuid}/", "provenance"
end
@@
-90,20
+90,8
@@
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
end
def textile_attributes