Merge branch 'master' into 2035-arv-mount-tags-folders

[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..5ff7798a959162eb27d27cf9c35fd41748bd35ac 100644 (file)
--- a/apps/workbench/app/models/virtual_machine.rb
+++ b/apps/workbench/app/models/virtual_machine.rb
@@ -16,6 +16,6 @@ class VirtualMachine < ArvadosBase
             super]
   end
   def friendly_link_name
-    self.hostname
+    (hostname && !hostname.empty?) ? hostname : uuid
   end
 end