apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 3316: Added a processing message while migrating an instance.

Browse Source 
- 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
This commit is contained in:
will 2011-03-11 17:17:52 -08:00
parent aa66c5a551
commit 0ed91473ba
6 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/WEB-INF/classes/resources/messages.properties
View File

@ -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....

1
client/WEB-INF/classes/resources/messages_es.properties
View File

@ -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

1
client/WEB-INF/classes/resources/messages_ja.properties
View File

@ -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 =ルータ再起動

3
client/WEB-INF/classes/resources/messages_zh_CN.properties
View File

@ -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 =重启路由器

1
ui/jsp/instance.jsp
View File

@ -32,6 +32,7 @@ dictionary = {
'label.action.change.service': '<fmt:message key="label.action.change.service"/>',
'label.action.change.service.processing': '<fmt:message key="label.action.change.service.processing"/>',
'label.action.migrate.instance': '<fmt:message key="label.action.migrate.instance"/>',
'label.action.migrate.instance.processing': '<fmt:message key="label.action.migrate.instance.processing"/>',
'label.action.detach.disk': '<fmt:message key="label.action.detach.disk"/>',
'label.action.detach.disk.processing': '<fmt:message key="label.action.detach.disk.processing"/>',
'label.action.create.template': '<fmt:message key="label.action.create.template"/>',

11
ui/scripts/cloud.core.instance.js
View File

@ -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', {