projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3889-functional-testing
[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 839cd52493e8b55c6f8dcba2cc0454740a71a09b..978964196d412b76f993e46b717a7977ea773ecc 100644
(file)
--- a/
apps/workbench/app/models/virtual_machine.rb
+++ b/
apps/workbench/app/models/virtual_machine.rb
@@
-7,7
+7,7
@@
class VirtualMachine < ArvadosBase
super.append ['current_user_logins', @current_user_logins]
end
def attribute_editable? attr, *args
super.append ['current_user_logins', @current_user_logins]
end
def attribute_editable? attr, *args
- attr != 'current_user_logins' and super
(attr, *args)
+ attr != 'current_user_logins' and super
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) }