11840: include ensure_unique_name parameter in untrash requests from workbench.

[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 edd87add19ada373ef4892fc532b2ffe8884a8de..025c136d41bed69883a80d0cc12cbc3bfdf43ec9 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
-    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
@@ -66,16 +70,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
-  end
-
-  def self.creatable?
-    false
+  def editable_attributes
+    %w(name description manifest_text filename)
   end
 
   def provenance
@@ -94,20 +90,15 @@ class Collection < ArvadosBase
     end
   end
 
-  def portable_data_hash
-    if self[:portable_data_hash].nil?
-      return self[:uuid]
-    else
-      super
-    end
+  def friendly_link_name lookup=nil
+    name || portable_data_hash
   end
 
-  def friendly_link_name
-    if self.respond_to? :name
-      self.name
-    else
-      self.portable_data_hash
-    end
+  def textile_attributes
+    [ 'description' ]
   end
 
+  def untrash
+    arvados_api_client.api(self.class, "/#{self.uuid}/untrash", {"ensure_unique_name" => true})
+  end
 end