Merge branch 'master' into 3618-column-ordering

[arvados.git] / apps / workbench / app / models / virtual_machine.rb

diff --git a/apps/workbench/app/models/virtual_machine.rb b/apps/workbench/app/models/virtual_machine.rb
index 1b672108375555517539245316f5bbc16dfa930c..3b44397df5459efb7074f46bd094826192e061eb 100644 (file)
--- a/apps/workbench/app/models/virtual_machine.rb
+++ b/apps/workbench/app/models/virtual_machine.rb
@@ -6,8 +6,8 @@ class VirtualMachine < ArvadosBase
   def attributes_for_display
     super.append ['current_user_logins', @current_user_logins]
   end
-  def attribute_editable?(attr)
-    attr != 'current_user_logins' and super
+  def editable_attributes
+    super - %w(current_user_logins)
   end
   def self.attribute_info
     merger = ->(k,a,b) { a.merge(b, &merger) }
@@ -15,4 +15,7 @@ class VirtualMachine < ArvadosBase
             {current_user_logins: {column_heading: "logins", type: 'array'}},
             super]
   end
+  def friendly_link_name lookup=nil
+    (hostname && !hostname.empty?) ? hostname : uuid
+  end
 end