You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2017/09/26 22:26:16 UTC
[17/50] [abbrv] ambari git commit: AMBARI-22035. Stack and Versions
page is stuck while trying to install a new stack (alexantonenko)
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/19b16073
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/19b16073
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/19b16073
Branch: refs/heads/branch-3.0-ams
Commit: 19b16073c50556de666c17b3749ff6a0c1dae398
Parents: ea89244
Author: Alex Antonenko <aa...@hortonworks.com>
Authored: Fri Sep 22 19:25:38 2017 +0300
Committer: Alex Antonenko <aa...@hortonworks.com>
Committed: Fri Sep 22 19:25:38 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/19b16073/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 746fc53..61056ae 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/19b16073/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')));