From b9bde1cc5f14fa4b4b6cacc2ddd98b26c069769f Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Sun, 31 Oct 2010 11:24:40 -0700
Subject: [PATCH] new UI - IP address - fix a regression ("0 is null or not an
 object"  when adding a port forwarding rule or adding a load balancer rule)
 caused by API refactor.

---
 ui/new/scripts/cloud.core2.ipaddress.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ui/new/scripts/cloud.core2.ipaddress.js b/ui/new/scripts/cloud.core2.ipaddress.js
index f0de344b415..d7da1bf54c3 100644
--- a/ui/new/scripts/cloud.core2.ipaddress.js
+++ b/ui/new/scripts/cloud.core2.ipaddress.js
@@ -114,8 +114,8 @@ function afterLoadIpJSP() {
 	        data: createURL("command=createPortForwardingRule"+array1.join("")),
 	        dataType: "json",
 	        success: function(json) {		                      
-	            var items = json.createportforwardingruleresponse.portforwardingrule;	  	        	
-	            portForwardingJsonToTemplate(items[0],$template);
+	            var item = json.createportforwardingruleresponse;	  	        	
+	            portForwardingJsonToTemplate(item,$template);
 	            $spinningWheel.hide();   
 	            refreshCreatePortForwardingRow();			   						
 	        },
@@ -167,8 +167,8 @@ function afterLoadIpJSP() {
 	        data: createURL("command=createLoadBalancerRule"+array1.join("")),
 			dataType: "json",
 			success: function(json) {					    	    
-				var items = json.createloadbalancerruleresponse.loadbalancerrule;						
-	            loadBalancerJsonToTemplate(items[0], $template);
+				var item = json.createloadbalancerruleresponse;						
+	            loadBalancerJsonToTemplate(item, $template);
 	            $spinningWheel.hide();   
 	            refreshCreateLoadBalancerRow();	            	
 			},
@@ -943,7 +943,8 @@ function refreshLbVmSelect($template, loadBalancerId) {
 			    for (var i = 0; i < instances.length; i++) {
 			        var vmName = getVmName(instances[i].name, instances[i].displayname);
 				    html = $("<option value='" + instances[i].id + "'>" + vmName + "</option>")
-				    html.data("vmPrivateIp", instances[i].privateip).data("vmName", vmName);
+				    html.data("vmPrivateIp", instances[i].privateip);
+				    html.data("vmName", vmName);
 				    vmSelect.append(html); 
 			    }
 		    } else {