Merge branch 'master' into 3618-column-ordering

[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 048ac59a0a94360cc50e7f4bd1ee4cb9d02e908c..e66be83078c9f5dbe2fff3be09dcba17c5fb4bf9 100644 (file)
--- a/apps/workbench/app/models/node.rb
+++ b/apps/workbench/app/models/node.rb
@@ -1,6 +1,8 @@
 class Node < ArvadosBase
-  attr_accessor :object
-  def friendly_link_name
-    self.hostname
+  def self.creatable?
+    current_user and current_user.is_admin
+  end
+  def friendly_link_name lookup=nil
+    (hostname && !hostname.empty?) ? hostname : uuid
   end
 end