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 2D386200B5C for ; Thu, 28 Jul 2016 00:42:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2BE13160A93; Wed, 27 Jul 2016 22:42:41 +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 7B642160A90 for ; Thu, 28 Jul 2016 00:42:40 +0200 (CEST) Received: (qmail 82537 invoked by uid 500); 27 Jul 2016 22:42:34 -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 82528 invoked by uid 99); 27 Jul 2016 22:42:34 -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; Wed, 27 Jul 2016 22:42:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 80CA5E02A2; Wed, 27 Jul 2016 22:42:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xiwang@apache.org To: commits@ambari.apache.org Message-Id: <6a399c3e62e7429fa49253f8aeceb5a5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-17934. UI issue on clicking back while installing a cluster.(xiwang) Date: Wed, 27 Jul 2016 22:42:34 +0000 (UTC) archived-at: Wed, 27 Jul 2016 22:42:41 -0000 Repository: ambari Updated Branches: refs/heads/trunk 3d4ab478c -> ba8b03d72 AMBARI-17934. UI issue on clicking back while installing a cluster.(xiwang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ba8b03d7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ba8b03d7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ba8b03d7 Branch: refs/heads/trunk Commit: ba8b03d72468ea13e0ccfa83a314d39ffe31faf4 Parents: 3d4ab47 Author: Xi Wang Authored: Wed Jul 27 15:20:32 2016 -0700 Committer: Xi Wang Committed: Wed Jul 27 15:42:18 2016 -0700 ---------------------------------------------------------------------- ambari-web/app/controllers/installer.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ba8b03d7/ambari-web/app/controllers/installer.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js index 3253de2..a2bac41 100644 --- a/ambari-web/app/controllers/installer.js +++ b/ambari-web/app/controllers/installer.js @@ -333,9 +333,12 @@ App.InstallerController = App.WizardController.extend({ _oses.forEach(function (os) { App.OperatingSystem.find().findProperty('id', os.id).set('isSelected', os.is_selected); }); - App.OperatingSystem.find().filterProperty('isSelected', false).forEach(function (os) { - App.stackMapper.deleteRecord(os); - }); + //should delete the record on going to step 2, on going back to step 1, still need the record + if (App.router.get('currentState.name') != "step1") { + App.OperatingSystem.find().filterProperty('isSelected', false).forEach(function (os) { + App.stackMapper.deleteRecord(os); + }); + } _stacks.forEach(function (_stack) { var stack = App.Stack.find().findProperty('id', _stack.id); if (stack) {