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

Use shared function todb(), fromdb().

This commit is contained in:
Jessica Wang 2010-09-30 15:48:53 -07:00
parent 1f173cc8f3
commit e0542260eb
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ui/scripts/cloud.core.configuration.js
View File

@ -1242,9 +1242,9 @@ function showConfigurationTab() {
var moreCriteria = [];
var name = trim(thisDialog.find("#edit_service_name").val());
moreCriteria.push("&name="+encodeURIComponent(escape(name)));
moreCriteria.push("&name="+todb(name));
var displaytext = trim(thisDialog.find("#edit_service_display").val());
moreCriteria.push("&displayText="+encodeURIComponent(escape(displaytext)));
moreCriteria.push("&displayText="+todb(displaytext));
var offerha = trim(thisDialog.find("#edit_service_offerha").val());
moreCriteria.push("&offerha="+offerha);
@ -1301,14 +1301,14 @@ function showConfigurationTab() {
template.data("svcId", json.id).data("svcName", fromdb(json.name));
template.find("#service_id").text(json.id);
template.find("#service_name").text(unescape(json.name));
template.find("#service_displaytext").text(unescape(json.displaytext));
template.find("#service_name").text(fromdb(json.name));
template.find("#service_displaytext").text(fromdb(json.displaytext));
template.find("#service_storagetype").text(json.storagetype);
template.find("#service_cpu").text(json.cpunumber + " x " + convertHz(json.cpuspeed));
template.find("#service_memory").text(convertBytes(parseInt(json.memory)*1024*1024));
template.find("#service_offerha").text(toBooleanText(json.offerha));
template.find("#service_networktype").text(toNetworkType(json.usevirtualnetwork));
template.find("#service_tags").text(unescape(json.tags));
template.find("#service_tags").text(fromdb(json.tags));
setDateField(json.created, template.find("#service_created"));
}
@ -1436,10 +1436,10 @@ function showConfigurationTab() {
var array1 = [];
var name = trim(thisDialog.find("#add_service_name").val());
array1.push("&name="+encodeURIComponent(escape(name)));
array1.push("&name="+todb(name));
var display = trim(thisDialog.find("#add_service_display").val());
array1.push("&displayText="+encodeURIComponent(escape(display)));
array1.push("&displayText="+todb(display));
var storagetype = trim(thisDialog.find("#add_service_storagetype").val());
array1.push("&storageType="+storagetype);
@ -1462,7 +1462,7 @@ function showConfigurationTab() {
var tags = trim(thisDialog.find("#add_service_tags").val());
if(tags != null && tags.length > 0)
array1.push("&tags="+encodeURIComponent(escape(tags)));
array1.push("&tags="+todb(tags));
thisDialog.dialog("close");
$.ajax({
@ -1526,17 +1526,17 @@ function showConfigurationTab() {
var array1 = [];
var name = trim(thisDialog.find("#add_disk_name").val());
array1.push("&name="+encodeURIComponent(escape(name)));
array1.push("&name="+todb(name));
var description = trim(thisDialog.find("#add_disk_description").val());
array1.push("&displaytext="+encodeURIComponent(escape(description)));
array1.push("&displaytext="+todb(description));
var disksize = trim(thisDialog.find("#add_disk_disksize").val());
array1.push("&disksize="+disksize);
var tags = trim(thisDialog.find("#add_disk_tags").val());
if(tags != null && tags.length > 0)
array1.push("&tags="+encodeURIComponent(escape(tags)));
array1.push("&tags="+todb(tags));
thisDialog.dialog("close");
$.ajax({
@ -1631,7 +1631,7 @@ function showConfigurationTab() {
var dialogBox = $(this);
dialogBox.dialog("close");
$.ajax({
data: createURL("command=updateDiskOffering&name="+encodeURIComponent(escape(name))+"&displayText="+encodeURIComponent(escape(display))+"&id="+diskId+"&response=json"),
data: createURL("command=updateDiskOffering&name="+todb(name)+"&displayText="+todb(display)+"&id="+diskId+"&response=json"),
dataType: "json",
success: function(json) {
template.find("#disk_description").text(display);
@ -1684,11 +1684,11 @@ function showConfigurationTab() {
template.data("diskId", json.id).data("diskName", fromdb(json.name));
template.find("#disk_id").text(json.id);
template.find("#disk_name").text(unescape(json.name));
template.find("#disk_description").text(unescape(json.displaytext));
template.find("#disk_name").text(fromdb(json.name));
template.find("#disk_description").text(fromdb(json.displaytext));
template.find("#disk_disksize").text(convertBytes(json.disksize));
template.find("#disk_tags").text(unescape(json.tags));
template.find("#disk_domain").text(unescape(json.domain));
template.find("#disk_tags").text(fromdb(json.tags));
template.find("#disk_domain").text(fromdb(json.domain));
}
function listDiskOfferings() {