From ed6fbfa9588872e5e66a8434ec0b910206869f82 Mon Sep 17 00:00:00 2001
From: Jessica Wang
Date: Sun, 19 Sep 2010 11:55:08 -0700
Subject: [PATCH] new UI - load balancer page - fix a bug that new template was
attched to wrong grid.
---
ui/new/jsp/ipaddress.jsp | 2 +-
ui/new/scripts/cloud.core2.ipaddress.js | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ui/new/jsp/ipaddress.jsp b/ui/new/jsp/ipaddress.jsp
index dd77853ed37..35a2b4e0f16 100644
--- a/ui/new/jsp/ipaddress.jsp
+++ b/ui/new/jsp/ipaddress.jsp
@@ -346,7 +346,7 @@
Assigning instance to load balancer rule …
-
diff --git a/ui/new/scripts/cloud.core2.ipaddress.js b/ui/new/scripts/cloud.core2.ipaddress.js
index b1dbb186168..a1f72ad1670 100644
--- a/ui/new/scripts/cloud.core2.ipaddress.js
+++ b/ui/new/scripts/cloud.core2.ipaddress.js
@@ -112,7 +112,7 @@ function afterLoadIpJSP() {
dataType: "json",
success: function(json) {
var items = json.createloadbalancerruleresponse.loadbalancerrule;
- loadBalancerJsonToTemplate(items[0],$template);
+ loadBalancerJsonToTemplate(items[0], $template);
$spinningWheel.hide();
refreshCreateLoadBalancerRow();
},
@@ -431,7 +431,7 @@ function loadBalancerJsonToTemplate(jsonObj, $template) {
$template.find("#manage_link").unbind("click").bind("click", function(event){
var $managementArea = $template.find("#management_area");
- var $vmSubgrid = $managementArea.find("#grid_content");
+ var $vmSubgrid = $managementArea.find("#subgrid_content");
if($managementArea.css("display") == "none") {
$vmSubgrid.empty();
$.ajax({
@@ -631,7 +631,7 @@ function loadBalancerJsonToTemplate(jsonObj, $template) {
var $lbVmTemplate = $("#load_balancer_vm_template").clone();
var obj = {"loadBalancerId": loadBalancerId, "vmId": vmId, "vmName": vmName, "vmPrivateIp": vmPrivateIp};
lbVmObjToTemplate(obj, $lbVmTemplate);
- $template.find("#management_area #grid_content").append($lbVmTemplate.show());
+ $template.find("#management_area #subgrid_content").append($lbVmTemplate.show());
refreshLbVmSelect($template, loadBalancerId);
$spinningWheel.hide();
} else if (result.jobstatus == 2) { // Failed