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

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

diff --git a/apps/workbench/app/models/node.rb b/apps/workbench/app/models/node.rb
index 0a324ff5139bb88d5fcd77a65c3b638616182bdd..e66be83078c9f5dbe2fff3be09dcba17c5fb4bf9 100644 (file)
--- a/apps/workbench/app/models/node.rb
+++ b/apps/workbench/app/models/node.rb
@@ -2,7 +2,7 @@ class Node < ArvadosBase
   def self.creatable?
     current_user and current_user.is_admin
   end
-  def friendly_link_name
-    self.hostname
+  def friendly_link_name lookup=nil
+    (hostname && !hostname.empty?) ? hostname : uuid
   end
 end