From 027eb86e402d0952ee4e4bd871f5bac10d30361c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Fri, 12 Dec 2014 18:19:50 +0100
Subject: [PATCH] Bug #3131: Fix undefined label for the capacity

(cherry picked from commit 4e4930050d653081ddb342c4a372b010e623f7e1)

Conflicts:
	src/sunstone/public/js/plugins/provision-tab.js
---
 src/sunstone/public/js/plugins/provision-tab.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sunstone/public/js/plugins/provision-tab.js b/src/sunstone/public/js/plugins/provision-tab.js
index 7de9d7c181..298cbee861 100644
--- a/src/sunstone/public/js/plugins/provision-tab.js
+++ b/src/sunstone/public/js/plugins/provision-tab.js
@@ -2028,7 +2028,7 @@ function generate_provision_instance_type_accordion(context, capacity) {
     memory_value = Math.floor(capacity.MEMORY/1024);
     memory_unit = "GB";
   } else {
-    memory_value = capacity.MEMORY;
+    memory_value = (capacity.MEMORY ? capacity.MEMORY : '-');
     memory_unit = "MB";
   }
 
@@ -2050,7 +2050,7 @@ function generate_provision_instance_type_accordion(context, capacity) {
       '<div class="large-12 large-centered columns">'+
         '<div class="row text-center">'+
           '<div class="large-4 columns">'+
-            '<span class="cpu_value" style="color: #777; font-size:60px">'+capacity.CPU+'</span>'+
+            '<span class="cpu_value" style="color: #777; font-size:60px">'+(capacity.CPU ? capacity.CPU : '-')+'</span>'+
             '<br>'+
             '<span style="color: #999;">'+tr("CPU")+'</span>'+
           '</div>'+