Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9B81210B7E for ; Mon, 19 Jan 2015 11:16:54 +0000 (UTC) Received: (qmail 24896 invoked by uid 500); 19 Jan 2015 11:16:56 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 24868 invoked by uid 500); 19 Jan 2015 11:16:56 -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 24859 invoked by uid 99); 19 Jan 2015 11:16:56 -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, 19 Jan 2015 11:16:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 66F19E0383; Mon, 19 Jan 2015 11:16:56 +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, 19 Jan 2015 11:16:56 -0000 Message-Id: <8b8b59c758f1482a8d15a1a07efeffa7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] ambari git commit: AMBARI-9190 Versions: unable to load versions page, javascript error. (ababiichuk) Repository: ambari Updated Branches: refs/heads/trunk b3f0afbfc -> fe17e117f AMBARI-9190 Versions: unable to load versions page, javascript error. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/11295a89 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/11295a89 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/11295a89 Branch: refs/heads/trunk Commit: 11295a897c4fb0ccf9c36cd9f87c10708e758119 Parents: b3f0afb Author: aBabiichuk Authored: Mon Jan 19 12:50:52 2015 +0200 Committer: aBabiichuk Committed: Mon Jan 19 12:50:52 2015 +0200 ---------------------------------------------------------------------- ambari-web/app/views/main/admin/stack_upgrade/versions_view.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/11295a89/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js b/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js index 7d5205f..4cf13bc 100644 --- a/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js +++ b/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js @@ -148,10 +148,10 @@ App.MainAdminStackVersionsView = Em.View.extend({ */ filterBy: function (versions, filter) { var currentVersion = this.get('controller.currentVersion'); - if (filter && filter.get('value')) { + if (filter && filter.get('value') && this.get('controller.isLoaded')) { return versions.filter(function (version) { if (version.get('status') === 'INSTALLED' && filter.get('value') === 'UPGRADE_READY') { - return stringUtils.compareVersions(version.get('repositoryVersion'), currentVersion.repository_version) === 1; + return stringUtils.compareVersions(version.get('repositoryVersion'), Em.get(currentVersion, 'repository_version')) === 1; } else if (filter.get('value') === 'NOT_INSTALLED') { return ['INIT', 'INSTALL_FAILED', 'INSTALLING', 'OUT_OF_SYNC'].contains(version.get('status')); } else {