Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B08B1200CB7 for ; Fri, 30 Jun 2017 11:46:19 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AFD68160C0A; Fri, 30 Jun 2017 09:46:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0CB59160BF9 for ; Fri, 30 Jun 2017 11:46:18 +0200 (CEST) Received: (qmail 28946 invoked by uid 500); 30 Jun 2017 09:46:18 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 28933 invoked by uid 99); 30 Jun 2017 09:46:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Jun 2017 09:46:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9565DE78B0; Fri, 30 Jun 2017 09:46:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rlevas@apache.org To: commits@ambari.apache.org Date: Fri, 30 Jun 2017 09:46:20 -0000 Message-Id: <9871a432e57f4c4e864c8308808a6862@git.apache.org> In-Reply-To: <4bc3cc85431b4d9781f5694490c4d387@git.apache.org> References: <4bc3cc85431b4d9781f5694490c4d387@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/33] ambari git commit: AMBARI-21344. Add Services Using Repository ID (alexantonenko) archived-at: Fri, 30 Jun 2017 09:46:19 -0000 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/08dd492e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/08dd492e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/08dd492e Branch: refs/heads/branch-feature-AMBARI-20859 Commit: 08dd492e5fb801355be8e2dcd895d9cb09d3dd3c Parents: 4522cf5 Author: Alex Antonenko Authored: Mon Jun 26 17:44:29 2017 +0300 Committer: Alex Antonenko Committed: Tue Jun 27 11:05:14 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/08dd492e/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/08dd492e/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 = [];