Merge branch '5176-escape-filenames'

[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..1bd711be6423fad3fc0b360cce9e918653419fdb 100644 (file)
--- a/apps/workbench/app/models/collection.rb
+++ b/apps/workbench/app/models/collection.rb
@@ -66,16 +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
-  end
-
-  def self.creatable?
-    false
+  def editable_attributes
+    %w(name description manifest_text)
   end
 
   def provenance
@@ -94,20 +86,8 @@ class Collection < ArvadosBase
     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
-    if self.respond_to? :name
-      self.name
-    else
-      self.portable_data_hash
-    end
+    name || portable_data_hash
   end
 
   def textile_attributes