From 16ff38d0fd54a6b59792d06cfd6b3588566604f2 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 7 Dec 2011 19:01:03 -0800 Subject: [PATCH] bug 12381: fix a bug that opening another window to view console causes a JavaScript error "invalid argument" --- ui/scripts/instances.js | 2 +- ui/scripts/system.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 7d452b2b7f2..f8b70e70a3a 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -1467,7 +1467,7 @@ return clientConsoleUrl + '?cmd=access&vm=' + args.context.instances[0].id; }, title: function(args) { - return getVmName(args.context.instances[0].name, args.context.instances[0].displayname) + ' console'; + return "console"; //can't have space in window name in window.open() }, width: 820, height: 640 diff --git a/ui/scripts/system.js b/ui/scripts/system.js index f4589a26228..8227f3957df 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -1735,7 +1735,7 @@ return clientConsoleUrl + '?cmd=access&vm=' + args.context.routers[0].id; }, title: function(args) { - return args.context.routers[0].name + ' console'; + return "console"; //can't have space in window name in window.open() }, width: 820, height: 640 @@ -3980,7 +3980,7 @@ return clientConsoleUrl + '?cmd=access&vm=' + args.context.systemVMs[0].id; }, title: function(args) { - return args.context.systemVMs[0].systemvmtype + ' console'; + return "console"; //can't have space in window name in window.open() }, width: 820, height: 640