Signed-off-by: Chris Lalancette <[email protected]>
---
server/views/instances/show.xml.haml | 57 +++++++++++++++++++--------------
1 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/server/views/instances/show.xml.haml
b/server/views/instances/show.xml.haml
index 2fcc9c6..edcde8e 100644
--- a/server/views/instances/show.xml.haml
+++ b/server/views/instances/show.xml.haml
@@ -2,30 +2,39 @@
%instance{:href => instance_url(@instance.id)}
%id<
[email protected]
- %name<
- [email protected]
- %owner_id<
- [email protected]_id
- %image{:href => image_url(@instance.image_id)}
- %realm{:href => realm_url(@instance.realm_id)}
- %state<
- [email protected]
- - haml_tag :"hardware-profile", {:href =>
hardware_profile_url(@instance.instance_profile.id)} do
- %id<
- [email protected]_profile.id
- - @instance.instance_profile.overrides.each do |p, v|
- %property{:kind => 'fixed', :name => p, :value => v, :unit =>
Deltacloud::HardwareProfile::unit(p)}
- %actions
- - @instance.actions.compact.each do |instance_action|
- %link{:rel => instance_action, :method =>
instance_action_method(instance_action), :href =>
self.send("#{instance_action}_instance_url", @instance.id)}
- %public-addresses
- - @instance.public_addresses.each do |address|
- %address<
- =address
- %private-addresses
- - @instance.private_addresses.each do |address|
- %address<
- =address
+ - if @instance.name
+ %name<
+ [email protected]
+ - if @instance.owner_id
+ %owner_id<
+ [email protected]_id
+ - if @instance.image_id
+ %image{:href => image_url(@instance.image_id)}
+ - if @instance.realm_id
+ %realm{:href => realm_url(@instance.realm_id)}
+ - if @instance.state
+ %state<
+ [email protected]
+ - if @instance.instance_profile
+ - haml_tag :"hardware-profile", {:href =>
hardware_profile_url(@instance.instance_profile.id)} do
+ %id<
+ [email protected]_profile.id
+ - @instance.instance_profile.overrides.each do |p, v|
+ %property{:kind => 'fixed', :name => p, :value => v, :unit =>
Deltacloud::HardwareProfile::unit(p)}
+ - if @instance.actions
+ %actions
+ - @instance.actions.compact.each do |instance_action|
+ %link{:rel => instance_action, :method =>
instance_action_method(instance_action), :href =>
self.send("#{instance_action}_instance_url", @instance.id)}
+ - if @instance.public_addresses
+ %public-addresses
+ - @instance.public_addresses.each do |address|
+ %address<
+ =address
+ - if @instance.private_addresses
+ %private-addresses
+ - @instance.private_addresses.each do |address|
+ %address<
+ =address
- if driver_has_auth_features?
%authentication{ :type => driver_auth_feature_name }
- if @instance.authn_feature_failed?
--
1.6.6.1
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
