apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

new UI - When adding VLAN IP Range fails, pop up dialog box that has error message and remove the VLAN on screen.

Browse Source
This commit is contained in:
Jessica Wang 2010-10-18 10:26:14 -07:00
parent afbf68c9ed
commit 74cf1fe514
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/new/jsp/resource.jsp
View File

@ -917,12 +917,12 @@
<div class="networkswitch_vlan_infoicon">
</div>
<div class="networkswitch_vlan_detailsbox">
<div class="networkswitch_vlan_detailsbox_textbox" id="vlan_container">
<div class="networkswitch_vlan_detailsbox_textbox">
<div class="networkswitch_vlan_detailsbox_textbox_label">
VLAN:</div>
<span id="vlan_id">n</span>
</div>
<div class="networkswitch_vlan_detailsbox_textbox" id="ipaddress_container">
<div class="networkswitch_vlan_detailsbox_textbox">
<div class="networkswitch_vlan_detailsbox_textbox_label">
<%=t.t("ip.address.range")%>:</div>
<span id="ip_range">n.n.n.n - m.m.m.m</span>

28
ui/new/scripts/cloud.core2.resource.js
View File

@ -242,6 +242,7 @@ function zoneJsonToDetailsTab(jsonObj) {
$detailsTab.find("#guestcidraddress").text(fromdb(jsonObj.guestcidraddress));
}
var $vlanContainer;
function zoneJsonToNetworkTab(jsonObj) {
var $networkTab = $("#zone_page").find("#tab_content_network");
$networkTab.find("#zone_cloud").find("#zone_name").text(fromdb(jsonObj.name));
@ -252,7 +253,7 @@ function zoneJsonToNetworkTab(jsonObj) {
dataType: "json",
success: function(json) {
var items = json.listvlaniprangesresponse.vlaniprange;
var $vlanContainer = $networkTab.find("#vlan_container").empty();
$vlanContainer = $networkTab.find("#vlan_container").empty();
if (items != null && items.length > 0) {
for (var i = 0; i < items.length; i++) {
var item = items[i];
@ -535,26 +536,27 @@ function initAddVLANButton($midmenuAdd2Link) {
var netmask = trim(thisDialog.find("#add_publicip_vlan_netmask").val());
var startip = trim(thisDialog.find("#add_publicip_vlan_startip").val());
var endip = trim(thisDialog.find("#add_publicip_vlan_endip").val());
//comment it out until css is fixed.
/*
var $template2;
var $template1;
if(type == "false") //direct
$template2 = $("#direct_vlan_template").clone();
$template1 = $("#direct_vlan_template").clone();
else //public
$template2 = $("#virtual_vlan_template").clone();
$("#zone_page").find("#tab_content_network").find("#vlan_container").prepend($template2.show());
*/
$template1 = $("#virtual_vlan_template").clone();
if($vlanContainer != null)
$vlanContainer.prepend($template1.show());
$.ajax({
data: createURL("command=createVlanIpRange&forVirtualNetwork="+type+"&zoneId="+zoneObj.id+vlan+scopeParams+"&gateway="+encodeURIComponent(gateway)+"&netmask="+encodeURIComponent(netmask)+"&startip="+encodeURIComponent(startip)+"&endip="+encodeURIComponent(endip)),
dataType: "json",
success: function(json) {
//vlanJsonToTemplate(json.createvlaniprangeresponse, $template2); //comment it out until css is fixed.
zoneJsonToNetworkTab(zoneObj); //temporary solution until css is fixed.
vlanJsonToTemplate(json.createvlaniprangeresponse, $template1);
},
error: function(XMLHttpResponse) {
handleError(XMLHttpResponse);
handleError(XMLHttpResponse);
$template1.slideUp(function(){
$(this).remove();
});
}
});