From 0ed91473baf39af095f984a96233067544a60462 Mon Sep 17 00:00:00 2001 From: will Date: Fri, 11 Mar 2011 17:17:52 -0800 Subject: [PATCH] bug 3316: Added a processing message while migrating an instance. - Changed the call of migrate vm from sync to async - Defaulted to an empty select box if attempting to migrate a vm with local storage --- client/WEB-INF/classes/resources/messages.properties | 1 + .../WEB-INF/classes/resources/messages_es.properties | 1 + .../WEB-INF/classes/resources/messages_ja.properties | 1 + .../classes/resources/messages_zh_CN.properties | 3 ++- ui/jsp/instance.jsp | 1 + ui/scripts/cloud.core.instance.js | 11 ++++++++--- 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 40ab0a7da02..632f5a76abd 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -117,6 +117,7 @@ label.action.generate.keys=Generate Keys label.action.lock.account.processing=Locking account.... label.action.lock.account=Lock account label.action.migrate.instance=Migrate Instance +label.action.migrate.instance.processing=Migrating Instance.... label.action.reboot.instance.processing=Rebooting Instance.... label.action.reboot.instance=Reboot Instance label.action.reboot.router.processing=Rebooting Router.... diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties index 37dcac88a3c..48967dc1dd9 100644 --- a/client/WEB-INF/classes/resources/messages_es.properties +++ b/client/WEB-INF/classes/resources/messages_es.properties @@ -117,6 +117,7 @@ label.action.generate.keys.processing = Generar claves .... label.action.lock.account = Bloqueo de cuenta label.action.lock.account.processing = Bloqueo de cuenta .... label.action.migrate.instance = Migrar Instancia +label.action.migrate.instance.processing = Migrar Instancia .... label.action.reboot.instance = Reiniciar Instancia label.action.reboot.instance.processing = Reiniciar Instancia .... label.action.reboot.router = Reiniciar router diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties index 2eff9e04974..19f46ca19b8 100644 --- a/client/WEB-INF/classes/resources/messages_ja.properties +++ b/client/WEB-INF/classes/resources/messages_ja.properties @@ -117,6 +117,7 @@ label.action.generate.keys.processing =キーを生成しています.... label.action.lock.account =アカウントロック label.action.lock.account.processing =アカウントをロックしています.... label.action.migrate.instance=移行インスタンス +label.action.migrate.instance.processing = 移行インスタンス.... label.action.reboot.instance =インスタンス再起動 label.action.reboot.instance.processing =インスタンスを再起動しています.... label.action.reboot.router =ルータ再起動 diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties index ccc688d8575..63c55e52e57 100644 --- a/client/WEB-INF/classes/resources/messages_zh_CN.properties +++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties @@ -116,7 +116,8 @@ label.action.generate.keys =生成密钥 label.action.generate.keys.processing =生成密钥.... label.action.lock.account =锁定帐号 label.action.lock.account.processing =锁定帐号.... -label.action.migrate.instance =遷移實例 +label.action.migrate.instance =遷移實例 +label.action.migrate.instance.processing=遷移實例.... label.action.reboot.instance =重启虚拟机 label.action.reboot.instance.processing =重启虚拟机.... label.action.reboot.router =重启路由器 diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp index 376202354a9..9c02f1a4fea 100644 --- a/ui/jsp/instance.jsp +++ b/ui/jsp/instance.jsp @@ -32,6 +32,7 @@ dictionary = { 'label.action.change.service': '', 'label.action.change.service.processing': '', 'label.action.migrate.instance': '', + 'label.action.migrate.instance.processing': '', 'label.action.detach.disk': '', 'label.action.detach.disk.processing': '', 'label.action.create.template': '', diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js index a9a29280ae3..eb73586e522 100644 --- a/ui/scripts/cloud.core.instance.js +++ b/ui/scripts/cloud.core.instance.js @@ -1370,8 +1370,8 @@ var vmActionMap = { } }, "label.action.migrate.instance": { - isAsyncJob: false, - inProcessText: "label.action.migrate.instance", + isAsyncJob: true, + inProcessText: "label.action.migrate.instance.processing", dialogBeforeActionFn : doMigrateInstance, afterActionSeccessFn: function(json, $midmenuItem1, id) { var jsonObj = json.queryasyncjobresultresponse.jobresult.virtualmachine; @@ -1695,8 +1695,13 @@ function doMigrateInstance($actionLink, $detailsTab, $midmenuItem1) { hostSelect.append(option); } } + }, + error: function(XMLHttpResponse) { + handleError(XMLHttpResponse, function() { + $("#dialog_migrate_instance #migrate_instance_hosts").empty(); + }); } - }); +}); $("#dialog_migrate_instance") .dialog('option', 'buttons', {