From 0356b80b3c1720e1cfca5c76f0be1017350418a4 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 23 Dec 2010 20:39:29 -0800
Subject: [PATCH] IP Address page - Edit load balancer rule - populate
 algorithm dropdown with network data instead of hard-coding.

---
 ui/jsp/ipaddress.jsp               | 4 +++-
 ui/scripts/cloud.core.ipaddress.js | 9 ++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp
index 0886a74cae0..8e7adbd4126 100644
--- a/ui/jsp/ipaddress.jsp
+++ b/ui/jsp/ipaddress.jsp
@@ -427,10 +427,12 @@
             <div class="row_celltitles" id="private_port"></div>
         </div>
         <div class="grid_row_cell" style="width: 15%;">
-            <select id="algorithm_select" class="select" style="width: 70%;">                       
+            <select id="algorithm_select" class="select" style="width: 70%;">   
+                <!--                   
 				<option value="roundrobin">roundrobin</option>
                 <option value="leastconn">leastconn</option>
                 <option value="source">source</option>
+                -->   
             </select>
         </div>
         <div class="grid_row_cell" style="width: 29%;">
diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index 27b84eade23..b5be453d2f5 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -438,9 +438,12 @@ function ipJsonToLoadBalancerTab() {
 	if(networkObj.service[6].name == "Lb" && networkObj.service[6].capability[0].name == "SupportedLbAlgorithms") {
        var algorithms = networkObj.service[6].capability[0].value;  //e.g. "roundrobin,leastconn,sourceip"        
        var array1 = algorithms.split(",");
-       var $algorithmField = $("#create_load_balancer_row").find("#algorithm_select").empty();
-       for(var i=0; i<array1.length; i++)
-           $algorithmField.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>")
+       var $algorithmField1 = $("#create_load_balancer_row").find("#algorithm_select").empty();
+       var $algorithmField2 = $("#load_balancer_template").find("#row_container_edit").find("#algorithm_select").empty();
+       for(var i=0; i<array1.length; i++) {
+           $algorithmField1.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>");
+           $algorithmField2.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>");
+       }
     }  	
     refreshCreateLoadBalancerRow();