projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
closes #4476
[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 978964196d412b76f993e46b717a7977ea773ecc..3b44397df5459efb7074f46bd094826192e061eb 100644
(file)
--- a/
apps/workbench/app/models/virtual_machine.rb
+++ b/
apps/workbench/app/models/virtual_machine.rb
@@
-6,8
+6,8
@@
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, *arg
s
- attr != 'current_user_logins' and super
+ def
editable_attribute
s
+ super - %w(current_user_logins)
end
def self.attribute_info
merger = ->(k,a,b) { a.merge(b, &merger) }
end
def self.attribute_info
merger = ->(k,a,b) { a.merge(b, &merger) }
@@
-15,7
+15,7
@@
class VirtualMachine < ArvadosBase
{current_user_logins: {column_heading: "logins", type: 'array'}},
super]
end
{current_user_logins: {column_heading: "logins", type: 'array'}},
super]
end
- def friendly_link_name
+ def friendly_link_name
lookup=nil
(hostname && !hostname.empty?) ? hostname : uuid
end
end
(hostname && !hostname.empty?) ? hostname : uuid
end
end