ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject ambari git commit: AMBARI-22035. Stack and Versions page is stuck while trying to install a new stack (alexantonenko)
Date Fri, 22 Sep 2017 16:25:08 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 f5ec32912 -> 3ac67ff8f


AMBARI-22035. Stack and Versions page is stuck while trying to install a new stack (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3ac67ff8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3ac67ff8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3ac67ff8

Branch: refs/heads/branch-2.6
Commit: 3ac67ff8f67d204c88b72d97e761ce43ba40e246
Parents: f5ec329
Author: Alex Antonenko <aantonenko@hortonworks.com>
Authored: Fri Sep 22 19:24:55 2017 +0300
Committer: Alex Antonenko <aantonenko@hortonworks.com>
Committed: Fri Sep 22 19:24:55 2017 +0300

----------------------------------------------------------------------
 ambari-web/app/mappers/repository_version_mapper.js | 2 +-
 ambari-web/app/mappers/stack_version_mapper.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3ac67ff8/ambari-web/app/mappers/repository_version_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/repository_version_mapper.js b/ambari-web/app/mappers/repository_version_mapper.js
index a58a154..6706a06 100644
--- a/ambari-web/app/mappers/repository_version_mapper.js
+++ b/ambari-web/app/mappers/repository_version_mapper.js
@@ -123,7 +123,7 @@ App.repoVersionMapper = App.QuickDataMapper.create({
                 display_name: service.display_name,
                 latest_version: service.versions[0] ? service.versions[0] : '',
                 is_available: item[repoVersionsKey].services.someProperty('name', service.name),
-                is_upgradable: json.stackServices[service.name] && json.stackServices[service.name].upgrade
+                is_upgradable: json.stackServices ? json.stackServices[service.name] &&
json.stackServices[service.name].upgrade : true
               };
               resultService.push(serviceObj);
             }, this);

http://git-wip-us.apache.org/repos/asf/ambari/blob/3ac67ff8/ambari-web/app/mappers/stack_version_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/stack_version_mapper.js b/ambari-web/app/mappers/stack_version_mapper.js
index 9fa0b78..7612674 100644
--- a/ambari-web/app/mappers/stack_version_mapper.js
+++ b/ambari-web/app/mappers/stack_version_mapper.js
@@ -81,7 +81,7 @@ App.stackVersionMapper = App.QuickDataMapper.create({
           item.repository_versions[0].RepositoryVersions.stackVersionId = item.ClusterStackVersions.id;
           App.repoVersionMapper.map({
             "items": item.repository_versions,
-            "stackServices": item.ClusterStackVersions.repository_summary.services
+            "stackServices": item.ClusterStackVersions.repository_summary && item.ClusterStackVersions.repository_summary.services
           }, true, true);
         }
         resultStack.push(this.parseIt(stack, this.get('modelStack')));


Mime
View raw message