ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject [1/2] ambari git commit: AMBARI-9190 Versions: unable to load versions page, javascript error. (ababiichuk)
Date Mon, 19 Jan 2015 11:16:56 GMT
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 <ababiichuk@cybervisiontech.com>
Authored: Mon Jan 19 12:50:52 2015 +0200
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
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 {


Mime
View raw message