bug 9021: Fixed network rate display issue in network offering.

This commit is contained in:
will 2011-03-29 18:50:31 -07:00
parent 9f3f99f27f
commit e32aa32bfc
6 changed files with 14 additions and 4 deletions

View File

@ -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

View File

@ -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

View File

@ -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証明書更新

View File

@ -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证书

View File

@ -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>

View File

@ -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 ***