AMBARI-21384. Message for deleted hosts is confusing (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f17d317b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f17d317b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f17d317b Branch: refs/heads/feature-branch-AMBARI-21307 Commit: f17d317b725012ccc687ee070b1e1dbc604e8d12 Parents: 8e719f7 Author: Alex Antonenko <hiv...@gmail.com> Authored: Fri Jun 30 17:42:53 2017 +0300 Committer: Alex Antonenko <hiv...@gmail.com> Committed: Fri Jul 7 10:38:45 2017 +0300 ---------------------------------------------------------------------- .../app/controllers/main/host/bulk_operations_controller.js | 6 +++--- ambari-web/app/messages.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f17d317b/ambari-web/app/controllers/main/host/bulk_operations_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/host/bulk_operations_controller.js b/ambari-web/app/controllers/main/host/bulk_operations_controller.js index 92ae12e..b053fc3 100644 --- a/ambari-web/app/controllers/main/host/bulk_operations_controller.js +++ b/ambari-web/app/controllers/main/host/bulk_operations_controller.js @@ -444,7 +444,7 @@ App.BulkOperationsController = Em.Controller.extend({ templateName: require('templates/main/host/delete_hosts_result_popup'), message: Em.I18n.t('hosts.bulkOperation.deleteHosts.dryRun.message').format(undeletableHosts.length), undeletableHosts: undeletableHosts, - deletedHosts: deletedHosts, + deletedHosts: deletedHosts.sortProperty('deleted.key'), onToggleHost: function (host) { host.contexts[0].toggleProperty('isCollapsed'); } @@ -823,7 +823,7 @@ App.BulkOperationsController = Em.Controller.extend({ templateName: require('templates/main/host/delete_hosts_result_popup'), message: Em.I18n.t('hosts.bulkOperation.delete.component.dryRun.message').format(undeletableHosts.length), undeletableHosts: undeletableHosts, - deletedHosts: deletedHosts, + deletedHosts: deletedHosts.sortProperty('deleted.key'), onToggleHost: function (host) { host.contexts[0].toggleProperty('isCollapsed'); } @@ -1295,4 +1295,4 @@ App.BulkOperationsController = Em.Controller.extend({ return hostNamesSkipped; } -}); \ No newline at end of file +}); http://git-wip-us.apache.org/repos/asf/ambari/blob/f17d317b/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index e88ec42..5e1d08f 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -2593,7 +2593,7 @@ Em.I18n.translations = { 'hosts.bulkOperation.deleteHosts.confirmation.body.msg3': 'To completely delete the hosts, first stop ambari-agent on them.', 'hosts.bulkOperation.deleteHosts.confirmation.body.msg4': 'If the hosts were hosting a Zookeeper Server, the Zookeeper Service should be restarted. Go to the <i>Services</i> page.', 'hosts.bulkOperation.deleteHosts.result.header':'Delete Hosts', - 'hosts.bulkOperation.deleteHosts.result.body': 'The following hosts were deleted successfully:', + 'hosts.bulkOperation.deleteHosts.result.body': 'The following hosts and host components were deleted successfully:', 'hosts.bulkOperation.confirmation.delete.component.minimum.body': 'At least {0} {1} should be installed in the cluster.', 'hosts.bulkOperation.confirmation.delete.component.nothingToDo.body': '{0} are neither installed on selected hosts nor in the states that can be deleted.', 'hosts.bulkOperation.confirmation.delete.component.skip':'The following hosts are skipped as {0} on them are not in the states that can be deleted.',
