4840: Workbench selection actions are submitted by POST.

[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 40fd930e38a99ae453ff11e01defcedec35af5fb..686b816c08e2343419ea6e44f0f983a05cb0d6ce 100644 (file)
--- a/apps/workbench/app/models/collection.rb
+++ b/apps/workbench/app/models/collection.rb
@@ -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?
@@ -94,20 +90,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
-    if self.respond_to? :name
-      self.name
-    else
-      self.portable_data_hash
-    end
+  def friendly_link_name lookup=nil
+    name || portable_data_hash
   end
 
   def textile_attributes