Merge branch 'master' into 3052-crunch-log-stdout

[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 5f6131ebfaa9a30fa464581d0102555d4368dc38..083aae31ecb10c0f7b5b97e0e6d7b9c5129cff2e 100644 (file)
--- a/apps/workbench/app/models/virtual_machine.rb
+++ b/apps/workbench/app/models/virtual_machine.rb
@@ -6,7 +6,7 @@ class VirtualMachine < ArvadosBase
   def attributes_for_display
     super.append ['current_user_logins', @current_user_logins]
   end
-  def attribute_editable?(attr)
+  def attribute_editable? attr, *args
     attr != 'current_user_logins' and super
   end
   def self.attribute_info
@@ -15,7 +15,7 @@ class VirtualMachine < ArvadosBase
             {current_user_logins: {column_heading: "logins", type: 'array'}},
             super]
   end
-  def friendly_link_name
-    self.hostname
+  def friendly_link_name lookup=nil
+    (hostname && !hostname.empty?) ? hostname : uuid
   end
 end