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

bug 10232: CloudStack UI - Instance page - fix a bug that VMName was not decoded when encode.api.response is set to true.

This commit is contained in:
Jessica Wang 2011-06-13 14:58:56 -07:00
parent 9461990d9e
commit fae0d33a49
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ui/scripts/cloud.core.js
View File

@ -1947,27 +1947,13 @@ function sanitizeXSS(val) {
function getVmName(p_vmName, p_vmDisplayname) {
if(p_vmDisplayname == null)
return fromdb(p_vmName);
var vmName = null;
var vmName = null;
if (p_vmDisplayname != p_vmName) {
vmName = p_vmName + "(" + fromdb(p_vmDisplayname) + ")";
vmName = fromdb(p_vmName) + "(" + fromdb(p_vmDisplayname) + ")";
} else {
vmName = p_vmName;
}
/*
if (isAdmin()) {
if (p_vmDisplayname != p_vmName) {
vmName = p_vmName + "(" + fromdb(p_vmDisplayname) + ")";
} else {
vmName = p_vmName;
}
} else {
vmName = fromdb(p_vmDisplayname);
}
*/
vmName = fromdb(p_vmName);
}
return vmName;
}