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 19E842009E8 for ; Mon, 30 May 2016 11:27:20 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 18A73160A3C; Mon, 30 May 2016 09:27:20 +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 5FDDF160A16 for ; Mon, 30 May 2016 11:27:19 +0200 (CEST) Received: (qmail 93941 invoked by uid 500); 30 May 2016 09:27: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 93928 invoked by uid 99); 30 May 2016 09:27: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; Mon, 30 May 2016 09:27:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 690ACE0446; Mon, 30 May 2016 09:27:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ababiichuk@apache.org To: commits@ambari.apache.org Date: Mon, 30 May 2016 09:27:18 -0000 Message-Id: <0861c79b971e41dbbe5967c21482935c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] ambari git commit: AMBARI-16930 Message text is missing in EU wizard screens that require manual intervention. (ababiichuk) archived-at: Mon, 30 May 2016 09:27:20 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.4 615133d75 -> 97ff55232 AMBARI-16930 Message text is missing in EU wizard screens that require manual intervention. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a4a4e6e6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a4a4e6e6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a4a4e6e6 Branch: refs/heads/branch-2.4 Commit: a4a4e6e6e490758b646cd52e67992b16282202b5 Parents: 615133d Author: ababiichuk Authored: Fri May 27 18:21:17 2016 +0300 Committer: ababiichuk Committed: Mon May 30 12:26:00 2016 +0300 ---------------------------------------------------------------------- .../main/admin/stack_and_upgrade_controller.js | 27 ++++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a4a4e6e6/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js index 53fdc03..e09b4b0 100644 --- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js +++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js @@ -427,20 +427,19 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage, newGroup.upgrade_items.forEach(function (item) { var oldItem = App.upgradeEntity.create({type: 'ITEM'}, item.UpgradeItem); var status = oldItem.get('status'); - if ('HOLDING' == status){ - //manualItem - var text = oldItem.get('text'); - try { - var messageArray = $.parseJSON(text) - var messages = []; - for(var i = 0; i < messageArray.length; i ++){ - var aMessageObj = messageArray[i]; - messages.push(aMessageObj.message); - } - oldItem.set('messages', messages) - oldItem.set('text', messages.join(' ')) - } catch (err){} - } + var text = oldItem.get('text'); + + try { + var messageArray = $.parseJSON(text); + var messages = []; + for(var i = 0; i < messageArray.length; i ++){ + var aMessageObj = messageArray[i]; + messages.push(aMessageObj.message); + } + oldItem.set('messages', messages); + oldItem.set('text', messages.join(' ')); + } catch (err){} + oldItem.set('tasks', []); upgradeItems.pushObject(oldItem); });