Merge branch 'master' into 4062-infinite-scroll-repeat-issue

[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 24e6da59babfaa30f3e9e00a75d59ee7d02b79b4..b5347dce00f24c64a388baac1dd9011935ab99c9 100644 (file)
--- a/apps/workbench/app/models/collection.rb
+++ b/apps/workbench/app/models/collection.rb
@@ -21,17 +21,17 @@ class Collection < ArvadosBase
   end
 
   def manifest
-    Keep::Manifest.new(manifest_text || "")
+    if @manifest.nil? or manifest_text_changed?
+      @manifest = Keep::Manifest.new(manifest_text || "")
+    end
+    @manifest
   end
 
   def files
     # This method provides backwards compatibility for code that relied on
     # the old files field in API results.  New code should use manifest
     # methods directly.
-    if @files.nil? or manifest_text_changed?
-      @files = manifest.each_file.to_a
-    end
-    @files
+    manifest.files
   end
 
   def content_summary
@@ -39,11 +39,11 @@ class Collection < ArvadosBase
   end
 
   def total_bytes
-    manifest.each_file.inject(0) { |sum, filespec| sum + filespec.last }
+    manifest.files.inject(0) { |sum, filespec| sum + filespec.last }
   end
 
   def files_tree
-    tree = manifest.each_file.group_by do |file_spec|
+    tree = manifest.files.group_by do |file_spec|
       File.split(file_spec.first)
     end
     return [] if tree.empty?
@@ -66,12 +66,8 @@ class Collection < ArvadosBase
     dir_to_tree.call('.')
   end
 
-  def attribute_editable? attr, *args
-    if %w(name description manifest_text).include? attr.to_s
-      true
-    else
-      super
-    end
+  def editable_attributes
+    %w(name description manifest_text)
   end
 
   def self.creatable?
@@ -102,7 +98,7 @@ class Collection < ArvadosBase
     end
   end
 
-  def friendly_link_name
+  def friendly_link_name lookup=nil
     if self.respond_to? :name
       self.name
     else
@@ -110,4 +106,8 @@ class Collection < ArvadosBase
     end
   end
 
+  def textile_attributes
+    [ 'description' ]
+  end
+
 end