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

add createURL() to $.ajax() command

Browse Source
This commit is contained in:
jessica 2010-08-24 17:22:24 -07:00 committed by unknown
parent 27fd14ac14
commit fc295b0fdd
1 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ui/new/scripts/cloud.core.instance.js
View File

@ -287,14 +287,8 @@ function clickInstanceGroupHeader($arrowIcon) {
$arrowIcon.removeClass("open").addClass("close"); $arrowIcon.removeClass("open").addClass("close");
$instanceGroupContainer.empty(); $instanceGroupContainer.empty();
} }
<<<<<<< HEAD
//***** VM Detail (end) ********************************************************************************
$("#right_panel").load("content/tab_instance.htm", function() {
=======
//***** VM Detail (end) ******************************************************************************** //***** VM Detail (end) ********************************************************************************
$("#right_panel").load("jsp/tab_instance.jsp", function() { $("#right_panel").load("jsp/tab_instance.jsp", function() {
>>>>>>> 10bc0b5... new UI - left menu, middle menu, instance
$rightPanelHeader = $("#right_panel_header"); $rightPanelHeader = $("#right_panel_header");
$rightPanelContent = $("#right_panel_content"); $rightPanelContent = $("#right_panel_content");
@ -305,41 +299,10 @@ function clickInstanceGroupHeader($arrowIcon) {
var currentPageInTemplateGridInVmPopup =1; var currentPageInTemplateGridInVmPopup =1;
var selectedTemplateTypeInVmPopup; //selectedTemplateTypeInVmPopup will be set to "featured" when new VM dialog box opens var selectedTemplateTypeInVmPopup; //selectedTemplateTypeInVmPopup will be set to "featured" when new VM dialog box opens
/*
$vmPopup.find("#wizard_service_offering").bind("click", function(event){
event.stopPropagation(); //do not use event.preventDetault(), otherwise, radio button won't be checked.
var serviceOfferingId = $vmPopup.find("#wizard_service_offering input[name=service]:checked").val();
if(getDirectAttachNetworkGroupsEnabled() != "true") {
$vmPopup.find("#wizard_network_groups_container").hide();
}
else {
$.ajax({
data: "command=listServiceOfferings&response=json&id="+serviceOfferingId,
dataType: "json",
success: function(json) {
var offerings = json.listserviceofferingsresponse.serviceoffering;
if (offerings != null && offerings.length > 0) {
if(offerings[0].usevirtualnetwork =="true") { //virtual network
$vmPopup.find("#wizard_network_groups_container").hide();
}
else { //direct attached
if($vmPopup.find("#wizard_network_groups").find("option").length == 0)
$vmPopup.find("#wizard_network_groups_container").hide();
else
$vmPopup.find("#wizard_network_groups_container").show();
}
}
}
});
}
});
*/
$("#add_link").unbind("click").bind("click", function(event) { $("#add_link").unbind("click").bind("click", function(event) {
vmWizardOpen(); vmWizardOpen();
$.ajax({ $.ajax({
data: "command=listZones&available=true&response=json", data: createURL("command=listZones&available=true&response=json"),
dataType: "json", dataType: "json",
success: function(json) { success: function(json) {
var zones = json.listzonesresponse.zone; var zones = json.listzonesresponse.zone;
@ -354,7 +317,7 @@ function clickInstanceGroupHeader($arrowIcon) {
}); });
$.ajax({ $.ajax({
data: "command=listServiceOfferings&response=json", data: createURL("command=listServiceOfferings&response=json"),
dataType: "json", dataType: "json",
async: false, async: false,
success: function(json) { success: function(json) {
@ -387,7 +350,7 @@ function clickInstanceGroupHeader($arrowIcon) {
$.ajax({ $.ajax({
data: "command=listDiskOfferings&domainid=1&response=json", data: createURL("command=listDiskOfferings&domainid=1&response=json"),
dataType: "json", dataType: "json",
async: false, async: false,
success: function(json) { success: function(json) {
@ -599,7 +562,7 @@ function clickInstanceGroupHeader($arrowIcon) {
$vmPopup.find("#prevPage").show(); $vmPopup.find("#prevPage").show();
$.ajax({ $.ajax({
data: commandString, data: createURL(commandString),
dataType: "json", dataType: "json",
async: false, async: false,
success: function(json) { success: function(json) {
@ -874,7 +837,7 @@ function clickInstanceGroupHeader($arrowIcon) {
*/ */
$.ajax({ $.ajax({
data: "command=deployVirtualMachine"+moreCriteria.join("")+"&response=json", data: createURL("command=deployVirtualMachine"+moreCriteria.join("")+"&response=json"),
dataType: "json", dataType: "json",
success: function(json) { success: function(json) {
var jobId = json.deployvirtualmachineresponse.jobid; var jobId = json.deployvirtualmachineresponse.jobid;
@ -887,7 +850,7 @@ function clickInstanceGroupHeader($arrowIcon) {
timerKey, timerKey,
function() { function() {
$.ajax({ $.ajax({
data: "command=queryAsyncJobResult&jobId="+jobId+"&response=json", data: createURL("command=queryAsyncJobResult&jobId="+jobId+"&response=json"),
dataType: "json", dataType: "json",
success: function(json) { success: function(json) {
var result = json.queryasyncjobresultresponse; var result = json.queryasyncjobresultresponse;