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 b5347dce00f24c64a388baac1dd9011935ab99c9..1bd711be6423fad3fc0b360cce9e918653419fdb 100644 (file)
--- a/apps/workbench/app/models/collection.rb
+++ b/apps/workbench/app/models/collection.rb
@@ -70,10 +70,6 @@ class Collection < ArvadosBase
     %w(name description manifest_text)
   end
 
-  def self.creatable?
-    false
-  end
-
   def provenance
     arvados_api_client.api "collections/#{self.uuid}/", "provenance"
   end
@@ -90,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