You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by is...@apache.org on 2017/11/07 15:18:55 UTC

ambari git commit: AMBARI-22371. Bulk host delete to be hidden as experimental property. (ishanbha)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 6e09a8462 -> 6425c855d


AMBARI-22371. Bulk host delete to be hidden as experimental property. (ishanbha)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6425c855
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6425c855
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6425c855

Branch: refs/heads/branch-2.6
Commit: 6425c855d9d0517cac4ea0223979b2a122814a84
Parents: 6e09a84
Author: Ishan Bhatt <is...@gmail.com>
Authored: Tue Nov 7 07:18:20 2017 -0800
Committer: Ishan Bhatt <is...@gmail.com>
Committed: Tue Nov 7 07:18:20 2017 -0800

----------------------------------------------------------------------
 ambari-web/app/config.js                                | 3 ++-
 ambari-web/app/utils/ajax/ajax.js                       | 3 ++-
 ambari-web/app/views/main/host/hosts_table_menu_view.js | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6425c855/ambari-web/app/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index f5959f0..e0863cb 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -91,7 +91,8 @@ App.supports = {
   enabledWizardForHostOrderedUpgrade: true,
   manageJournalNode: true,
   enableToggleKerberos: true,
-  enableAddDeleteServices: true
+  enableAddDeleteServices: true,
+  enableBulkDeleteHosts: false
 };
 
 if (App.enableExperimental) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/6425c855/ambari-web/app/utils/ajax/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js
index 20a60c3..b95f5f1 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -303,7 +303,8 @@ var urls = {
       return {
         data: JSON.stringify({
           RequestInfo: {
-            query: data.query
+            query: data.query,
+            force_delete_components: true
           }
         })
       }

http://git-wip-us.apache.org/repos/asf/ambari/blob/6425c855/ambari-web/app/views/main/host/hosts_table_menu_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/host/hosts_table_menu_view.js b/ambari-web/app/views/main/host/hosts_table_menu_view.js
index dccffaa..6fe640c 100644
--- a/ambari-web/app/views/main/host/hosts_table_menu_view.js
+++ b/ambari-web/app/views/main/host/hosts_table_menu_view.js
@@ -306,7 +306,7 @@ App.HostTableMenuView = Em.View.extend({
           message: Em.I18n.t('hosts.host.details.setRackId').format('hosts')
         })
       }));
-      if (App.isAuthorized("HOST.ADD_DELETE_HOSTS")) {
+      if (App.get('supports.enableBulkDeleteHosts') && App.isAuthorized("HOST.ADD_DELETE_HOSTS")) {
         result = result.concat(O.create({
           label: Em.I18n.t('hosts.host.details.deleteHosts'),
           operationData: O.create({