projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3859-api-job-lock-method
[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 31ee9122f71ce48163ac6f3512d6b0bddcd5b6e3..978964196d412b76f993e46b717a7977ea773ecc 100644
(file)
--- a/
apps/workbench/app/models/virtual_machine.rb
+++ b/
apps/workbench/app/models/virtual_machine.rb
@@
-4,10
+4,9
@@
class VirtualMachine < ArvadosBase
current_user.andand.is_admin
end
def attributes_for_display
current_user.andand.is_admin
end
def attributes_for_display
- logger.debug super.append ['current_user_logins', @current_user_logins]
super.append ['current_user_logins', @current_user_logins]
end
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,4
+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
+ (hostname && !hostname.empty?) ? hostname : uuid
+ end
end
end