Revert "AMBARI-21344. Add Services Using Repository ID (alexantonenko)"
This reverts commit 08dd492e5fb801355be8e2dcd895d9cb09d3dd3c. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/068f86a1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/068f86a1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/068f86a1 Branch: refs/heads/feature-branch-AMBARI-21307 Commit: 068f86a1c751a501acd78572a25c1d6e223e70e6 Parents: e666e9b Author: Dmytro Grinenko <hapyles...@apache.org> Authored: Thu Jul 6 15:42:55 2017 +0300 Committer: Dmytro Grinenko <hapyles...@apache.org> Committed: Thu Jul 6 15:42:55 2017 +0300 ---------------------------------------------------------------------- .../app/controllers/wizard/step8_controller.js | 16 ++++++++++------ ambari-web/app/models/stack.js | 4 +--- 2 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/068f86a1/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 42519e0..fa44a24 100644 --- a/ambari-web/app/controllers/wizard/step8_controller.js +++ b/ambari-web/app/controllers/wizard/step8_controller.js @@ -913,9 +913,6 @@ 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(); }); @@ -1014,13 +1011,20 @@ 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(service => selectedStack ? - {"ServiceInfo": { "service_name": service.get('serviceName'), "desired_repository_version_id": selectedStack.get('versionInfoId') }} : - {"ServiceInfo": { "service_name": service.get('serviceName') }}); + + 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') }}; + } + }); }, /** http://git-wip-us.apache.org/repos/asf/ambari/blob/068f86a1/ambari-web/app/models/stack.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/stack.js b/ambari-web/app/models/stack.js index 657ee5c..47d1c44 100644 --- a/ambari-web/app/models/stack.js +++ b/ambari-web/app/models/stack.js @@ -34,8 +34,6 @@ 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'), @@ -83,4 +81,4 @@ App.Stack = DS.Model.extend({ }); -App.Stack.FIXTURES = []; +App.Stack.FIXTURES = []; \ No newline at end of file