AMBARI-21344. Add Services Using Repository ID (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/02fe5fa6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/02fe5fa6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/02fe5fa6 Branch: refs/heads/trunk Commit: 02fe5fa62e9561b17cdfd3876794faff884ccd05 Parents: 406abf4 Author: Alex Antonenko <hiv...@gmail.com> Authored: Mon Jun 26 17:44:29 2017 +0300 Committer: Alex Antonenko <hiv...@gmail.com> Committed: Thu Jul 6 16:25:05 2017 +0300 ---------------------------------------------------------------------- .../app/controllers/wizard/step8_controller.js | 16 ++++++---------- ambari-web/app/models/stack.js | 4 +++- 2 files changed, 9 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/02fe5fa6/ambari-web/app/controllers/wizard/step8_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js index fa44a24..42519e0 100644 --- a/ambari-web/app/controllers/wizard/step8_controller.js +++ b/ambari-web/app/controllers/wizard/step8_controller.js @@ -913,6 +913,9 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz installerController.postVersionDefinitionFileStep8(versionData.isXMLdata, versionData.data).done(function (versionInfo) { if (versionInfo.id && versionInfo.stackName && versionInfo.stackVersion) { var selectedStack = App.Stack.find().findProperty('isSelected', true); + if (selectedStack) { + selectedStack.set('versionInfoId', versionInfo.id); + } installerController.updateRepoOSInfo(versionInfo, selectedStack).done(function() { self._startDeploy(); }); @@ -1011,20 +1014,13 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz * @method createSelectedServicesData */ createSelectedServicesData: function () { - - var isInstaller = this.get('isInstaller') var selectedStack; if (this.get('isInstaller')) { selectedStack = App.Stack.find().findProperty('isSelected', true); } - - return this.get('selectedServices').map(function (_service) { - if (selectedStack) { - return {"ServiceInfo": { "service_name": _service.get('serviceName'), "desired_repository_version": selectedStack.get('repositoryVersion') }}; - } else { - return {"ServiceInfo": { "service_name": _service.get('serviceName') }}; - } - }); + return this.get('selectedServices').map(service => selectedStack ? + {"ServiceInfo": { "service_name": service.get('serviceName'), "desired_repository_version_id": selectedStack.get('versionInfoId') }} : + {"ServiceInfo": { "service_name": service.get('serviceName') }}); }, /** http://git-wip-us.apache.org/repos/asf/ambari/blob/02fe5fa6/ambari-web/app/models/stack.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/stack.js b/ambari-web/app/models/stack.js index 47d1c44..657ee5c 100644 --- a/ambari-web/app/models/stack.js +++ b/ambari-web/app/models/stack.js @@ -34,6 +34,8 @@ App.Stack = DS.Model.extend({ operatingSystems: DS.hasMany('App.OperatingSystem'), isSelected: DS.attr('boolean', {defaultValue: false}), + versionInfoId: null, + stackNameVersion: Em.computed.concat('-', 'stackName', 'stackVersion'), isPatch: Em.computed.equal('type', 'PATCH'), @@ -81,4 +83,4 @@ App.Stack = DS.Model.extend({ }); -App.Stack.FIXTURES = []; \ No newline at end of file +App.Stack.FIXTURES = [];