ambari git commit: AMBARI-13691 Allow use passwords references in custom actions - UI changes. (atkach)

[atkach]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 e596d775a -> aefb1bc9e


AMBARI-13691 Allow use passwords references in custom actions - UI changes. 
(atkach)


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

Branch: refs/heads/branch-2.1
Commit: aefb1bc9e083af3d96099d1743004532aa79c001
Parents: e596d77
Author: Andrii Tkach <atk...@hortonworks.com>
Authored: Tue Nov 3 13:10:37 2015 +0200
Committer: Andrii Tkach <atk...@hortonworks.com>
Committed: Tue Nov 3 13:10:37 2015 +0200

----------------------------------------------------------------------
 ambari-web/app/utils/ajax/ajax.js               | 23 ++++++++++++++++++++
 .../widgets/test_db_connection_widget_view.js   |  3 ++-
 2 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/aefb1bc9/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 3e0298b..ea45fda 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -2363,6 +2363,29 @@ var urls = {
       }
     }
   },
+
+  'cluster.custom_action.create': {
+    'real': '/clusters/{clusterName}/requests',
+    'mock': '',
+    'format': function (data) {
+      var requestInfo = {
+        context: 'Check host',
+        action: 'check_host',
+        parameters: {}
+      };
+      $.extend(true, requestInfo, data.requestInfo);
+      return {
+        type: 'POST',
+        data: JSON.stringify({
+          'RequestInfo': requestInfo,
+          'Requests/resource_filters': [{
+            hosts: data.filteredHosts.join(',')
+          }]
+        })
+      }
+    }
+  },
+
   'custom_action.request': {
     'real': '/requests/{requestId}/tasks/{taskId}',
     'mock': '/data/requests/1.json',

http://git-wip-us.apache.org/repos/asf/ambari/blob/aefb1bc9/ambari-web/app/views/common/configs/widgets/test_db_connection_widget_view.js
----------------------------------------------------------------------
diff --git 
a/ambari-web/app/views/common/configs/widgets/test_db_connection_widget_view.js 
b/ambari-web/app/views/common/configs/widgets/test_db_connection_widget_view.js
index d22cb1f..199aac6 100644
--- 
a/ambari-web/app/views/common/configs/widgets/test_db_connection_widget_view.js
+++ 
b/ambari-web/app/views/common/configs/widgets/test_db_connection_widget_view.js
@@ -195,6 +195,7 @@ App.TestDbConnectionWidgetView = 
App.ConfigWidgetView.extend({
    **/
   createCustomAction: function () {
     var connectionProperties = 
this.getProperties('db_connection_url','user_name', 'user_passwd');
+    var isServiceInstalled = 
App.Service.find(this.get('config.serviceName')).get('isLoaded');
     for (var key in connectionProperties) {
       if (connectionProperties.hasOwnProperty(key)) {
         connectionProperties[key] = connectionProperties[key].value;
@@ -203,7 +204,7 @@ App.TestDbConnectionWidgetView = 
App.ConfigWidgetView.extend({
     var params = $.extend(true, {}, {db_name: 
this.get('db_type').toLowerCase()}, connectionProperties, 
this.get('ambariProperties'));
     var filteredHosts =  Array.isArray(this.get('masterHostName.value')) ? 
this.get('masterHostName.value') : [this.get('masterHostName.value')];
     App.ajax.send({
-      name: 'custom_action.create',
+      name: (isServiceInstalled) ? 'cluster.custom_action.create' : 
'custom_action.create',
       sender: this,
       data: {
         requestInfo: {