[ambari] branch branch-2.7 updated: AMBARI-24883. Previous config versions view of HBase service has missing configs. (jaimin) (#2596)

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jaimin pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new 94d4811  AMBARI-24883. Previous config versions view of HBase service has missing configs. (jaimin) (#2596)
94d4811 is described below

commit 94d4811c58aa6152ddd20651337b35c5bfaf95cd
Author: Jetly <ja...@hortonworks.com>
AuthorDate: Mon Nov 12 23:11:25 2018 -0800

    AMBARI-24883. Previous config versions view of HBase service has missing configs. (jaimin) (#2596)
---
 ambari-web/app/mixins/common/configs/configs_loader.js       | 2 +-
 ambari-web/app/utils/ajax/ajax.js                            | 2 +-
 ambari-web/test/mixins/common/configs/configs_loader_test.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ambari-web/app/mixins/common/configs/configs_loader.js b/ambari-web/app/mixins/common/configs/configs_loader.js
index 88d4092..5a2d3ea 100644
--- a/ambari-web/app/mixins/common/configs/configs_loader.js
+++ b/ambari-web/app/mixins/common/configs/configs_loader.js
@@ -179,7 +179,7 @@ App.ConfigsLoader = Em.Mixin.create(App.GroupsMappingMixin, {
       data: {
         serviceName: this.get('content.serviceName'),
         serviceConfigVersions: versions,
-        additionalParams: this.get('dependentServiceNames.length') ? '|service_name.in(' + this.get('dependentServiceNames') + ')&is_current=true' : ''
+        additionalParams: this.get('dependentServiceNames.length') ? '|(service_name.in(' + this.get('dependentServiceNames') + ')&is_current=true)' : ''
       },
       success: 'loadSelectedVersionsSuccess'
     }));
diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js
index 1e50d2c..3d9fc7e 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -2913,7 +2913,7 @@ var urls = {
     mock: '/data/configurations/service_version.json'
   },
   'service.serviceConfigVersions.get.multiple': {
-    real: '/clusters/{clusterName}/configurations/service_config_versions?service_name={serviceName}&service_config_version.in({serviceConfigVersions}){additionalParams}',
+    real: '/clusters/{clusterName}/configurations/service_config_versions?(service_name={serviceName}&service_config_version.in({serviceConfigVersions})){additionalParams}',
     mock: '/data/configurations/service_version.json',
     format: function (data) {
       return {
diff --git a/ambari-web/test/mixins/common/configs/configs_loader_test.js b/ambari-web/test/mixins/common/configs/configs_loader_test.js
index 162fdf7..a95b4c4 100644
--- a/ambari-web/test/mixins/common/configs/configs_loader_test.js
+++ b/ambari-web/test/mixins/common/configs/configs_loader_test.js
@@ -342,7 +342,7 @@ describe('App.ConfigsLoader', function() {
         data: {
           serviceName: 'S1',
           serviceConfigVersions: ['v1'],
-          additionalParams: '|service_name.in(S2)&is_current=true'
+          additionalParams: '|(service_name.in(S2)&is_current=true)'
         },
         success: 'loadSelectedVersionsSuccess'
       });