Skip to content
Permalink
Browse files
Merge pull request #2685 from atkach/AMBARI-24989-trunk
AMBARI-24989 Knox: Reorder of query parameters breaks Ambari logic for retrieving configs
  • Loading branch information
atkach committed Dec 4, 2018
2 parents 17f9098 + 26e3c49 commit 958db3ff83b5d7622a5fc632e8ae888c3324f479
Showing 3 changed files with 3 additions and 3 deletions.
@@ -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') + ')%26is_current=true)' : ''
},
success: 'loadSelectedVersionsSuccess'
}));
@@ -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}%26service_config_version.in({serviceConfigVersions})){additionalParams}',
mock: '/data/configurations/service_version.json',
format: function (data) {
return {
@@ -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)%26is_current=true)'
},
success: 'loadSelectedVersionsSuccess'
});

0 comments on commit 958db3f

Please sign in to comment.