etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 11570: cloudStack 2.2 - network page - add external load balancer - make "inline=true/false" to be included in url parameter in AddExternalLoadBalancer API.

This commit is contained in:
Jessica Wang 2011-09-29 15:28:45 -07:00
parent e13d2dc2dc
commit c5151f2847
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/jsp/network.jsp
View File

@ -1122,14 +1122,7 @@ dictionary = {
<div id="password_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li>
<label>
<fmt:message key="mode"/>:</label>
<select class="select" id="mode">
<option value="false"><fmt:message key="side.by.side"/></option>
<option value="true"><fmt:message key="inline"/></option>
</select>
</li>
<li>
<label>
<fmt:message key="label.public.interface"/>:</label>
@ -1150,7 +1143,15 @@ dictionary = {
<input class="text" type="text" id="numretries" />
<div id="numretries_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
</li>
<li>
<label>
<fmt:message key="mode"/>:</label>
<select class="select" id="mode">
<option value="false"><fmt:message key="side.by.side"/></option>
<option value="true"><fmt:message key="inline"/></option>
</select>
</li>
</ol>
</form>
</div>

17
ui/scripts/cloud.core.network.js
View File

@ -939,9 +939,6 @@ function bindAddLoadBalancerButton() {
var password = $thisDialog.find("#password").val();
array1.push("&password=" + todb(password));
var isInline = $thisDialog.find("#mode").val();
array1.push("&inline=" + isInline);
//*** construct URL (begin) ***
var url = [];
@ -988,7 +985,19 @@ function bindAddLoadBalancerButton() {
}
url.push("numretries="+numretries);
}
var isInline = $thisDialog.find("#mode").val();
if(isInline != null && isInline.length > 0) {
if(isQuestionMarkAdded == false) {
url.push("?");
isQuestionMarkAdded = true;
}
else {
url.push("&");
}
url.push("inline="+isInline);
}
array1.push("&url="+todb(url.join("")));
//*** construct URL (end) ***