Updated Branches: refs/heads/trunk 1f835e74a -> 5f24598b5
AMBARI-3626 Cleanup dialog for unable to delete host (masters installed). (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/5f24598b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/5f24598b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/5f24598b Branch: refs/heads/trunk Commit: 5f24598b50ca44c76e1890758a3ea9c79bdc3204 Parents: 1f835e7 Author: aBabiichuk <[email protected]> Authored: Wed Oct 30 18:16:27 2013 +0200 Committer: aBabiichuk <[email protected]> Committed: Wed Oct 30 18:19:52 2013 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/main/host/details.js | 2 +- ambari-web/app/messages.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/5f24598b/ambari-web/app/controllers/main/host/details.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js index 40447f3..7304665 100644 --- a/ambari-web/app/controllers/main/host/details.js +++ b/ambari-web/app/controllers/main/host/details.js @@ -705,7 +705,7 @@ App.MainHostDetailsController = Em.Controller.extend({ header: Em.I18n.t('hosts.cant.do.popup.title'), type: type, showBodyEnd: function() { - return this.get('type') === 'runningList'; + return this.get('type') === 'runningList' || this.get('type') === 'masterList'; }.property(), components: components, componentsStr: function() { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/5f24598b/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 4abe5c5..60ee511 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1301,7 +1301,8 @@ Em.I18n.translations = { 'hosts.delete.popup.title':'Delete Host', 'hosts.delete.popup.unknownComponents':'Components with unknown status:', 'hosts.cant.do.popup.title':'Unable to Delete Host', - 'hosts.cant.do.popup.masterList.body':'Host with {0} master components cannot be deleted', + 'hosts.cant.do.popup.masterList.body':'Host cannot be deleted with the master components installed', + 'hosts.cant.do.popup.masterList.body.end':'The master components on this host must to be stopped and moved to a different host to be able to delete this host', 'hosts.cant.do.popup.nonDeletableList.body':'Deletion of the following {0} components is not supported. ', 'hosts.cant.do.popup.runningList.body':'Host cannot be deleted with the following {0} components running. ', 'hosts.cant.do.popup.runningList.body.end':'Stop the components before reattempting to delete host. Some components might need special actions performed before deletion from cluster. For example, DataNode has to be decommissioned before being deleted.',
