projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2875-pipeline-description
[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..978964196d412b76f993e46b717a7977ea773ecc 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 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
attr != 'current_user_logins' and super
end
def self.attribute_info
@@
-16,6
+16,6
@@
class VirtualMachine < ArvadosBase
super]
end
def friendly_link_name
super]
end
def friendly_link_name
- self.hostname
+ (hostname && !hostname.empty?) ? hostname : uuid
end
end
end
end