You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mr...@apache.org on 2018/05/03 17:25:24 UTC
[ambari] 01/01: Merge pull request #1145 from
apache/branch-feature-AMBARI-14714-configs
This is an automated email from the ASF dual-hosted git repository.
mradhakrishnan pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit f32f21f4648fe26d45d22bfd379c01c8831919ad
Merge: b6d82fe 9308a86
Author: mradha25 <mr...@hortonworks.com>
AuthorDate: Thu May 3 10:25:20 2018 -0700
Merge pull request #1145 from apache/branch-feature-AMBARI-14714-configs
Branch feature ambari 14714 configs
.../controller/AmbariManagementControllerImpl.java | 3 +
ambari-web/app/controllers/wizard.js | 2 +-
.../app/controllers/wizard/step8_controller.js | 102 ++++++++---------
.../app/controllers/wizard/step9_controller.js | 4 +-
.../app/mixins/common/configs/configs_saver.js | 3 +-
ambari-web/app/utils/ajax/ajax.js | 9 +-
ambari-web/test/controllers/wizard/step8_test.js | 35 ++----
.../mixins/common/configs/configs_saver_test.js | 124 +++++++++++----------
8 files changed, 139 insertions(+), 143 deletions(-)
diff --cc ambari-web/app/controllers/wizard/step9_controller.js
index 55397bb,1785a94..6e87ad6
--- a/ambari-web/app/controllers/wizard/step9_controller.js
+++ b/ambari-web/app/controllers/wizard/step9_controller.js
@@@ -522,10 -522,10 +522,10 @@@ App.WizardStep9Controller = App.WizardS
serviceGroups = this.get('content.serviceGroups');
promises = serviceGroups.map(sg => {
- data.serviceGroup = sg;
+ data.serviceGroupName = sg;
return App.ajax.send({
- name: 'common.services.update',
+ name: 'common.services.update', //TODO: This should change to use common.services.update.all when that is implemented on the back end.
sender: this,
data: data,
success: 'launchStartServicesSuccessCallback',
@@@ -544,10 -544,10 +544,10 @@@
serviceGroups = this.get('content.serviceGroups');
promises = serviceGroups.map(sg => {
- data.serviceGroup = sg;
+ data.serviceGroupName = sg;
return App.ajax.send({
- name: 'common.services.update',
+ name: 'common.services.update', //TODO: This should change to use common.services.update.all when that is implemented on the back end.
sender: this,
data: data,
success: 'launchStartServicesSuccessCallback',
diff --cc ambari-web/app/utils/ajax/ajax.js
index de4c16f,fb54510..8a9ed87
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@@ -56,29 -56,8 +56,29 @@@ var urls =
}
},
+ 'common.services.update.all' : {
+ 'real': '/clusters/{clusterName}/servicegroups?{urlParams}',
+ 'format': function (data) {
+ return {
+ type: 'PUT',
+ data: JSON.stringify({
+ RequestInfo: {
+ "context": data.context,
+ "operation_level": {
+ "level": "CLUSTER",
+ "cluster_name" : data.clusterName
+ }
+ },
+ Body: {
+ ServiceInfo: data.ServiceInfo
+ }
+ })
+ };
+ }
+ },
+
'common.services.update' : {
- 'real': '/clusters/{clusterName}/servicegroups/{serviceGroup}/services?{urlParams}',
+ 'real': '/clusters/{clusterName}/servicegroups/{serviceGroupName}/services?{urlParams}',
'mock': '/data/wizard/deploy/poll_1.json',
'format': function (data) {
return {
--
To stop receiving notification emails like this one, please contact
mradhakrishnan@apache.org.