Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
jsteemann 2017-02-03 11:55:40 +01:00
parent f9105e8393 5edfa22230
commit cbcce38fa0
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js
View File

@ -69,6 +69,10 @@
return shortName; return shortName;
}, },
getDatabaseShortName: function (id) {
return this.getCoordinatorShortName(id);
},
getDatabaseServerId: function (shortname) { getDatabaseServerId: function (shortname) {
var id; var id;
if (window.clusterHealth) { if (window.clusterHealth) {

5
js/apps/system/_admin/aardvark/APP/frontend/js/views/shardsView.js
View File

@ -186,14 +186,15 @@
async: true, async: true,
success: function (data) { success: function (data) {
if (data.id) { if (data.id) {
arangoHelper.arangoNotification('Shard ' + shardName + ' will be moved to ' + arangoHelper.getDatabaseServerId(toServer) + '.'); console.log(toServer);
arangoHelper.arangoNotification('Shard ' + shardName + ' will be moved to ' + arangoHelper.getDatabaseShortName(toServer) + '.');
window.setTimeout(function () { window.setTimeout(function () {
window.App.shardsView.render(); window.App.shardsView.render();
}, 3000); }, 3000);
} }
}, },
error: function () { error: function () {
arangoHelper.arangoError('Shard ' + shardName + ' could not be moved to ' + arangoHelper.getDatabaseServerId(toServer) + '.'); arangoHelper.arangoError('Shard ' + shardName + ' could not be moved to ' + arangoHelper.getDatabaseShortName(toServer) + '.');
} }
}); });