Просмотр исходного кода

AMBARI-3626 Cleanup dialog for unable to delete host (masters installed). (ababiichuk)

aBabiichuk 11 лет назад
Родитель
Сommit
5f24598b50
2 измененных файлов с 3 добавлено и 2 удалено
  1. 1 1
      ambari-web/app/controllers/main/host/details.js
  2. 2 1
      ambari-web/app/messages.js

+ 1 - 1
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() {

+ 2 - 1
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.',