From bdb42c306ccb80d5b90439aa621f236e0aa02043 Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Tue, 29 Mar 2011 18:52:01 -0700
Subject: [PATCH] bug 9021: Fixed network rate display issue in network
 offering.

Merge from master
---
 client/WEB-INF/classes/resources/messages.properties     | 1 +
 client/WEB-INF/classes/resources/messages_es.properties  | 1 +
 client/WEB-INF/classes/resources/messages_ja.properties  | 3 ++-
 .../WEB-INF/classes/resources/messages_zh_CN.properties  | 1 +
 ui/jsp/networkoffering.jsp                               | 3 ++-
 ui/scripts/cloud.core.networkoffering.js                 | 9 +++++++--
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 632f5a76abd..2fdd1e50ea2 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -559,6 +559,7 @@ label.tuesday=Tuesday
 label.type.id=Type ID
 label.type=Type
 label.unavailable=Unavailable
+label.unlimited=Unlimited
 label.untagged=Untagged
 label.update.ssl.cert=Update SSL Certificate
 label.update.ssl=Update SSL Certificate
diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties
index 48967dc1dd9..310912df12d 100644
--- a/client/WEB-INF/classes/resources/messages_es.properties
+++ b/client/WEB-INF/classes/resources/messages_es.properties
@@ -559,6 +559,7 @@ label.tuesday = martes
 label.type = Tipo 
 label.type.id = Tipo de identificación 
 label.unavailable = no disponible 
+label.unlimited=Unlimited
 label.untagged = sin etiquetar 
 label.update.ssl = Actualizar certificado SSL 
 label.update.ssl.cert = Actualizar certificado SSL 
diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties
index 19f46ca19b8..ffb2aea15bc 100644
--- a/client/WEB-INF/classes/resources/messages_ja.properties
+++ b/client/WEB-INF/classes/resources/messages_ja.properties
@@ -558,7 +558,8 @@ label.traffic.type =トラフィックタイプ
 label.tuesday =火曜日 
 label.type =タイプ 
 label.type.id =タイプID 
-label.unavailable =使用不可 
+label.unavailable =使用不可
+label.unlimited=無制限の
 label.untagged=タグなし
 label.update.ssl =SSL証明書更新 
 label.update.ssl.cert =SSL証明書更新 
diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties
index 63c55e52e57..825103c79a6 100644
--- a/client/WEB-INF/classes/resources/messages_zh_CN.properties
+++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties
@@ -559,6 +559,7 @@ label.tuesday =星期二
 label.type =类型 
 label.type.id = 类型编码
 label.unavailable =不可用 
+label.unlimited=无限
 label.untagged =Untagged 
 label.update.ssl =更新SSL证书 
 label.update.ssl.cert =更新SSL证书 
diff --git a/ui/jsp/networkoffering.jsp b/ui/jsp/networkoffering.jsp
index 1e8fb207b25..b90834da9d1 100644
--- a/ui/jsp/networkoffering.jsp
+++ b/ui/jsp/networkoffering.jsp
@@ -7,7 +7,8 @@
 
 <script language="javascript">
 dictionary = { 	
-	'label.action.edit.network.offering' : '<fmt:message key="label.action.edit.network.offering"/>'
+	'label.action.edit.network.offering' : '<fmt:message key="label.action.edit.network.offering"/>',
+	'label.unlimited' : '<fmt:message key="label.unlimited"/>'
 };	
 </script>
 
diff --git a/ui/scripts/cloud.core.networkoffering.js b/ui/scripts/cloud.core.networkoffering.js
index aea24a74575..1b1443d874c 100644
--- a/ui/scripts/cloud.core.networkoffering.js
+++ b/ui/scripts/cloud.core.networkoffering.js
@@ -166,8 +166,13 @@ function networkOfferingJsonToDetailsTab() {
      
     setBooleanReadField(jsonObj.isdefault, $thisTab.find("#isdefault"));
     setBooleanReadField(jsonObj.specifyvlan, $thisTab.find("#specifyvlan"));
-      
-    $thisTab.find("#rate").text(fromdb(jsonObj.networkrate) + " Mb/s");
+      
+	var networkRate = jsonObj.networkrate;
+	if (networkRate == undefined || networkRate == "-1") {
+		$thisTab.find("#rate").text(dictionary["label.unlimited"]);
+	} else {
+		$thisTab.find("#rate").text(fromdb(networkRate) + " Mb/s");
+	}
     $thisTab.find("#traffictype").text(fromdb(jsonObj.traffictype));
    
     //actions ***