From 0763037d5f46fe656a0d690a4e88ddc0811dce98 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 4 Oct 2010 19:38:22 -0700 Subject: [PATCH] decode text returned from API. encode text passed to API. --- ui/new/scripts/cloud.core2.instance.js | 4 ++-- ui/new/scripts/cloud.core2.ipaddress.js | 6 +++--- ui/scripts/cloud.core.accounts.js | 2 +- ui/scripts/cloud.core.configuration.js | 18 +++++++++--------- ui/scripts/cloud.core.events.js | 12 ++++++------ ui/scripts/cloud.core.hosts.js | 4 ++-- ui/scripts/cloud.core.instances.js | 16 ++++++++-------- ui/scripts/cloud.core.network.js | 20 ++++++++++---------- 8 files changed, 41 insertions(+), 41 deletions(-) diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js index 85132bb1f23..eba8774f997 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -40,7 +40,7 @@ function clickInstanceGroupHeader($arrowIcon) { var instancegroups = json.listinstancegroupsresponse.instancegroup; if(instancegroups!=null && instancegroups.length>0) { for(var i=0; i < instancegroups.length; i++) { - appendInstanceGroup(instancegroups[i].id, instancegroups[i].name); + appendInstanceGroup(instancegroups[i].id, fromdb(instancegroups[i].name)); } } @@ -1286,7 +1286,7 @@ function doCreateTemplateFromVmVolume($actionLink, listAPIMap, $subgridItem) { var password = thisDialog.find("#create_template_password").val(); var id = $subgridItem.data("jsonObj").id; - var apiCommand = "command=createTemplate&volumeId="+id+"&name="+encodeURIComponent(name)+"&displayText="+encodeURIComponent(desc)+"&osTypeId="+osType+"&isPublic="+isPublic+"&passwordEnabled="+password; + var apiCommand = "command=createTemplate&volumeId="+id+"&name="+todb(name)+"&displayText="+todb(desc)+"&osTypeId="+osType+"&isPublic="+isPublic+"&passwordEnabled="+password; doActionToSubgridItem(id, $actionLink, apiCommand, listAPIMap, $subgridItem); }, "Cancel": function() { diff --git a/ui/new/scripts/cloud.core2.ipaddress.js b/ui/new/scripts/cloud.core2.ipaddress.js index 4beb817c2bd..40b99182e1c 100644 --- a/ui/new/scripts/cloud.core2.ipaddress.js +++ b/ui/new/scripts/cloud.core2.ipaddress.js @@ -102,7 +102,7 @@ function afterLoadIpJSP() { var array1 = []; array1.push("&publicip="+ipAddress); - array1.push("&name="+name); + array1.push("&name="+todb(name)); array1.push("&publicport="+publicPort); array1.push("&privateport="+privatePort); array1.push("&algorithm="+algorithm); @@ -429,8 +429,8 @@ function loadBalancerJsonToTemplate(jsonObj, $template) { var loadBalancerId = jsonObj.id; $template.attr("id", "loadBalancer_" + loadBalancerId).data("loadBalancerId", loadBalancerId); - $template.find("#row_container #name").text(jsonObj.name); - $template.find("#row_container_edit #name").val(jsonObj.name); + $template.find("#row_container #name").text(fromdb(jsonObj.name)); + $template.find("#row_container_edit #name").val(fromdb(jsonObj.name)); $template.find("#row_container #public_port").text(jsonObj.publicport); $template.find("#row_container_edit #public_port").text(jsonObj.publicport); diff --git a/ui/scripts/cloud.core.accounts.js b/ui/scripts/cloud.core.accounts.js index b4d1d868b31..7fb78fc5a43 100644 --- a/ui/scripts/cloud.core.accounts.js +++ b/ui/scripts/cloud.core.accounts.js @@ -295,7 +295,7 @@ function showAccountsTab(domainId) { var role = submenuContent.find("#advanced_search #adv_search_role").val(); var moreCriteria = []; if (name!=null && trim(name).length > 0) - moreCriteria.push("&name="+encodeURIComponent(trim(name))); + moreCriteria.push("&name="+todb(name)); if (trim(role).length > 0) moreCriteria.push("&accounttype="+role); commandString = "command=listAccounts&page="+currentPage+moreCriteria.join("")+"&response=json"; diff --git a/ui/scripts/cloud.core.configuration.js b/ui/scripts/cloud.core.configuration.js index 039d342c81c..ba5fdc1e5e4 100644 --- a/ui/scripts/cloud.core.configuration.js +++ b/ui/scripts/cloud.core.configuration.js @@ -52,7 +52,7 @@ function showConfigurationTab() { thisDialog.dialog("close"); $.ajax({ - data: createURL("command=updateConfiguration&name="+encodeURIComponent(name)+"&value="+encodeURIComponent(value)+"&response=json"), + data: createURL("command=updateConfiguration&name="+todb(name)+"&value="+todb(value)+"&response=json"), dataType: "json", success: function(json) { template.find("#global_value").text(value); @@ -119,7 +119,7 @@ function showConfigurationTab() { var name = submenuContent.find("#advanced_search #adv_search_name").val(); var moreCriteria = []; if (name!=null && trim(name).length > 0) - moreCriteria.push("&name="+encodeURIComponent(trim(name))); + moreCriteria.push("&name="+todb(name)); commandString = "command=listConfigurations&page="+currentPage+moreCriteria.join("")+"&response=json"; } else { var searchInput = submenuContent.find("#search_input").val(); @@ -316,7 +316,7 @@ function showConfigurationTab() { var moreCriteria = []; var name = trim(thisDialog.find("#edit_zone_name").val()); - moreCriteria.push("&name="+encodeURIComponent(name)); + moreCriteria.push("&name="+todb(name)); var dns1 = trim(thisDialog.find("#edit_zone_dns1").val()); moreCriteria.push("&dns1="+encodeURIComponent(dns1)); @@ -414,7 +414,7 @@ function showConfigurationTab() { var array1 = []; array1.push("&zoneId="+id); - array1.push("&name="+encodeURIComponent(name)); + array1.push("&name="+todb(name)); array1.push("&cidr="+encodeURIComponent(cidr)); array1.push("&startIp="+encodeURIComponent(startip)); if (endip != null && endip.length > 0) @@ -591,7 +591,7 @@ function showConfigurationTab() { var array1 = []; array1.push("&id="+id); if(newName != oldName) - array1.push("&name="+encodeURIComponent(newName)); + array1.push("&name="+todb(newName)); if(newCidr != oldCidr) array1.push("&cidr="+encodeURIComponent(newCidr)); if(newStartip != oldStartip) @@ -931,7 +931,7 @@ function showConfigurationTab() { var zoneid = json.id; template.data("id", zoneid).data("name", fromdb(json.name)); template.find("#zone_name") - .text(json.name) + .text(fromdb(json.name)) .data("id", zoneid) .data("name", fromdb(json.name)) .data("dns1", json.dns1) @@ -1117,7 +1117,7 @@ function showConfigurationTab() { var moreCriteria = []; var name = trim(thisDialog.find("#add_zone_name").val()); - moreCriteria.push("&name="+encodeURIComponent(name)); + moreCriteria.push("&name="+todb(name)); var dns1 = trim(thisDialog.find("#add_zone_dns1").val()); moreCriteria.push("&dns1="+encodeURIComponent(dns1)); @@ -1571,7 +1571,7 @@ function showConfigurationTab() { var name = submenuContent.find("#advanced_search #adv_search_name").val(); var moreCriteria = []; if (name!=null && trim(name).length > 0) - moreCriteria.push("&name="+encodeURIComponent(trim(name))); + moreCriteria.push("&name="+todb(name)); commandString = "command=listServiceOfferings&page="+currentPage+moreCriteria.join("")+"&response=json"; } else { var searchInput = submenuContent.find("#search_input").val(); @@ -1700,7 +1700,7 @@ function showConfigurationTab() { var name = submenuContent.find("#advanced_search #adv_search_name").val(); var moreCriteria = []; if (name!=null && trim(name).length > 0) - moreCriteria.push("&name="+encodeURIComponent(trim(name))); + moreCriteria.push("&name="+todb(name)); commandString = "command=listDiskOfferings&page="+currentPage+moreCriteria.join("")+"&response=json"; //moreCriteria.join("") } else { var searchInput = submenuContent.find("#search_input").val(); diff --git a/ui/scripts/cloud.core.events.js b/ui/scripts/cloud.core.events.js index 8866c6ddb92..89cd475e4f2 100644 --- a/ui/scripts/cloud.core.events.js +++ b/ui/scripts/cloud.core.events.js @@ -111,17 +111,17 @@ function showEventsTab(showEvents) { var enddate = submenuContent.find("#advanced_search #adv_search_enddate").val(); var moreCriteria = []; if (type!=null && trim(type).length > 0) - moreCriteria.push("&type="+encodeURIComponent(trim(type))); + moreCriteria.push("&type="+type); if (level!=null && level.length > 0) - moreCriteria.push("&level="+encodeURIComponent(trim(level))); + moreCriteria.push("&level="+level); if (domainId!=null && domainId.length > 0) moreCriteria.push("&domainid="+domainId); if (account!=null && account.length > 0) - moreCriteria.push("&account="+account); + moreCriteria.push("&account="+todb(account)); if (startdate!=null && startdate.length > 0) - moreCriteria.push("&startdate="+encodeURIComponent(startdate)); + moreCriteria.push("&startdate="+todb(startdate)); if (enddate!=null && enddate.length > 0) - moreCriteria.push("&enddate="+encodeURIComponent(enddate)); + moreCriteria.push("&enddate="+todb(enddate)); commandString = "command=listEvents&page="+currentPage+moreCriteria.join("")+"&response=json"; } else { var searchInput = submenuContent.find("#search_input").val(); @@ -238,7 +238,7 @@ function showEventsTab(showEvents) { var type = submenuContent.find("#advanced_search #adv_search_type").val(); var moreCriteria = []; if (type!=null && trim(type).length > 0) - moreCriteria.push("&type="+encodeURIComponent(trim(type))); + moreCriteria.push("&type="+type); commandString = "command=listAlerts&page="+currentPage+moreCriteria.join("")+"&response=json"; } else { var searchInput = submenuContent.find("#search_input").val(); diff --git a/ui/scripts/cloud.core.hosts.js b/ui/scripts/cloud.core.hosts.js index 25a9609d99f..554086d9207 100644 --- a/ui/scripts/cloud.core.hosts.js +++ b/ui/scripts/cloud.core.hosts.js @@ -621,7 +621,7 @@ function showHostsTab() { var hostname = trim(dialogBox.find("#host_hostname").val()); var url; if(hostname.indexOf("http://")==-1) - url = "http://" + hostname; + url = "http://" + todb(hostname); else url = hostname; array1.push("&url="+encodeURIComponent(url)); @@ -682,7 +682,7 @@ function showHostsTab() { var pod = submenuContent.find("#advanced_search #adv_search_pod").val(); var moreCriteria = []; if (name!=null && trim(name).length > 0) - moreCriteria.push("&name="+encodeURIComponent(trim(name))); + moreCriteria.push("&name="+todb(name)); if (state!=null && state.length > 0) moreCriteria.push("&state="+state); if (zone!=null && zone.length > 0) diff --git a/ui/scripts/cloud.core.instances.js b/ui/scripts/cloud.core.instances.js index 1d2622bff8c..f012ffaa8f5 100644 --- a/ui/scripts/cloud.core.instances.js +++ b/ui/scripts/cloud.core.instances.js @@ -712,7 +712,7 @@ function showInstancesTab(p_domainId, p_account) { var group = trim($("#change_group_name").val()); var vmInstance = $("#vm"+vmId); $.ajax({ - data: createURL("command=updateVirtualMachine&id="+vmId+"&group="+encodeURIComponent(group)+"&response=json"), + data: createURL("command=updateVirtualMachine&id="+vmId+"&group="+todb(group)+"&response=json"), dataType: "json", success: function(json) { vmInstance.find("#vm_group").text(group); @@ -741,7 +741,7 @@ function showInstancesTab(p_domainId, p_account) { var name = trim($("#change_instance_name").val()); $.ajax({ - data: createURL("command=updateVirtualMachine&id="+vmId+"&displayName="+encodeURIComponent(name)+"&response=json"), + data: createURL("command=updateVirtualMachine&id="+vmId+"&displayName="+todb(name)+"&response=json"), dataType: "json", success: function(json) { if (isAdmin()) { @@ -1656,11 +1656,11 @@ function showInstancesTab(p_domainId, p_account) { var name = trim(thisPopup.find("#wizard_vm_name").val()); if (name != null && name.length > 0) - moreCriteria.push("&displayname="+encodeURIComponent(name)); + moreCriteria.push("&displayname="+todb(name)); var group = trim(thisPopup.find("#wizard_vm_group").val()); if (group != null && group.length > 0) - moreCriteria.push("&group="+encodeURIComponent(group)); + moreCriteria.push("&group="+todb(group)); if(thisPopup.find("#wizard_network_groups_container").css("display") != "none" && thisPopup.find("#wizard_network_groups").val() != null) { var networkGroupList = thisPopup.find("#wizard_network_groups").val().join(","); @@ -1811,7 +1811,7 @@ function showInstancesTab(p_domainId, p_account) { var account = submenuContent.find("#advanced_search #adv_search_account").val(); var moreCriteria = []; if (name!=null && trim(name).length > 0) - moreCriteria.push("&name="+encodeURIComponent(trim(name))); + moreCriteria.push("&name="+todb(name)); if (state!=null && state.length > 0) moreCriteria.push("&state="+state); if (zone!=null && zone.length > 0) @@ -2322,7 +2322,7 @@ function showInstancesTab(p_domainId, p_account) { var account = submenuContent.find("#advanced_search #adv_search_account").val(); var moreCriteria = []; if (name!=null && trim(name).length > 0) - moreCriteria.push("&name="+encodeURIComponent(trim(name))); + moreCriteria.push("&name="+todb(name)); if (state!=null && state.length > 0) moreCriteria.push("&state="+state); if (zone!=null && zone.length > 0) @@ -2420,7 +2420,7 @@ function showInstancesTab(p_domainId, p_account) { var domainId = submenuContent.find("#advanced_search #adv_search_domain").val(); var moreCriteria = []; if (name!=null && trim(name).length > 0) - moreCriteria.push("&name="+encodeURIComponent(trim(name))); + moreCriteria.push("&name="+todb(name)); if (state!=null && state.length > 0) moreCriteria.push("&state="+state); if (zone!=null && zone.length > 0) @@ -2596,7 +2596,7 @@ function showInstancesTab(p_domainId, p_account) { template.find(".adding_loading").show(); template.find("#volume_body").hide(); $.ajax({ - data: createURL("command=createTemplate&volumeId="+volumeId+"&name="+encodeURIComponent(name)+"&displayText="+encodeURIComponent(desc)+"&osTypeId="+osType+"&isPublic="+isPublic+"&passwordEnabled="+password+"&response=json"), + data: createURL("command=createTemplate&volumeId="+volumeId+"&name="+todb(name)+"&displayText="+todb(desc)+"&osTypeId="+osType+"&isPublic="+isPublic+"&passwordEnabled="+password+"&response=json"), dataType: "json", success: function(json) { $("body").everyTime( diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js index 1a831acbfba..1409aa0844a 100644 --- a/ui/scripts/cloud.core.network.js +++ b/ui/scripts/cloud.core.network.js @@ -631,8 +631,8 @@ function showNetworkingTab(p_domainId, p_account) { var loadBalancerId = json.id; template.attr("id", "loadBalancer_" + loadBalancerId).data("loadBalancerId", loadBalancerId); - template.find("#row_container #name").text(json.name); - template.find("#row_container_edit #name").val(json.name); + template.find("#row_container #name").text(fromdb(json.name)); + template.find("#row_container_edit #name").val(fromdb(json.name)); template.find("#row_container #public_port").text(json.publicport); template.find("#row_container_edit #public_port").text(json.publicport); @@ -980,7 +980,7 @@ function showNetworkingTab(p_domainId, p_account) { var array1 = []; array1.push("&publicip="+ipAddress); - array1.push("&name="+name); + array1.push("&name="+todb(name)); array1.push("&publicport="+publicPort); array1.push("&privateport="+privatePort); array1.push("&algorithm="+algorithm); @@ -1152,10 +1152,10 @@ function showNetworkingTab(p_domainId, p_account) { template.find("#delete_link, #ingress_rule_link").data("parent_template_id", "networkGroup_"+json.id); template.find("#id").text(json.id); - template.find("#name").text(json.name); - template.find("#description").text(json.description); - template.find("#domain").text(json.domain); - template.find("#account").text(json.account); + template.find("#name").text(fromdb(json.name)); + template.find("#description").text(fromdb(json.description)); + template.find("#domain").text(fromdb(json.domain)); + template.find("#account").text(fromdb(json.account)); // disable delete link from the default group if(json.name == 'default' && json.description == 'Default Network Group') { @@ -1180,9 +1180,9 @@ function showNetworkingTab(p_domainId, p_account) { var account = submenuContent.find("#advanced_search #adv_search_account").val(); var moreCriteria = []; if (name!=null && trim(name).length > 0) - moreCriteria.push("&networkgroupname="+encodeURIComponent(trim(name))); + moreCriteria.push("&networkgroupname="+todb(name)); if (virtualMachineId!=null && virtualMachineId.length > 0) - moreCriteria.push("&virtualmachineid="+encodeURIComponent(virtualMachineId)); + moreCriteria.push("&virtualmachineid="+virtualMachineId); if (domainId!=null && domainId.length > 0) moreCriteria.push("&domainid="+domainId); if (account!=null && account.length > 0) @@ -1726,7 +1726,7 @@ function showNetworkingTab(p_domainId, p_account) { thisDialog.dialog("close"); $.ajax({ - data: createURL("command=createNetworkGroup&name="+encodeURIComponent(name)+"&description="+encodeURIComponent(desc)+"&response=json"), + data: createURL("command=createNetworkGroup&name="+todb(name)+"&description="+todb(desc)+"&response=json"), dataType: "json", success: function(json) { var items = json.createnetworkgroupresponse.networkgroup;