Repository: ambari Updated Branches: refs/heads/branch-2.6 47f97bbfa -> 4a8b85df3
AMBARI-21888. Upgrade History Should Show Advertised Versions (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4a8b85df Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4a8b85df Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4a8b85df Branch: refs/heads/branch-2.6 Commit: 4a8b85df38b023ab605e24f479ea2ce442aa9435 Parents: 47f97bb Author: Alex Antonenko <aantone...@hortonworks.com> Authored: Wed Sep 6 13:07:00 2017 +0300 Committer: Alex Antonenko <aantone...@hortonworks.com> Committed: Wed Sep 6 13:07:00 2017 +0300 ---------------------------------------------------------------------- .../views/main/admin/stack_upgrade/upgrade_history_view.js | 9 ++++----- .../main/admin/stack_upgrade/upgrade_history_view_test.js | 8 +++++--- 2 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4a8b85df/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js index 456b7f3..29524b3 100644 --- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js +++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js @@ -147,13 +147,12 @@ App.MainAdminStackUpgradeHistoryView = App.TableView.extend(App.TableServerViewM getRepoServicesForDisplay: function(versions) { return Object.keys(versions).map(function(serviceName) { - var fromVersion = App.RepositoryVersion.find(versions[serviceName].from_repository_id); - var toVersion = App.RepositoryVersion.find(versions[serviceName].to_repository_id); + var displayName = App.RepositoryVersion.find(versions[serviceName].from_repository_id).get('stackServices').findProperty('name', serviceName).get('displayName'); return { name: serviceName, - displayName: fromVersion.get('stackServices').findProperty('name', serviceName).get('displayName'), - fromVersion: fromVersion.get('stackServices').findProperty('name', serviceName).get('latestVersion'), - toVersion: toVersion.get('stackServices').findProperty('name', serviceName).get('latestVersion') + displayName: displayName, + fromVersion: versions[serviceName].from_repository_version, + toVersion: versions[serviceName].to_repository_version } }); }, http://git-wip-us.apache.org/repos/asf/ambari/blob/4a8b85df/ambari-web/test/views/main/admin/stack_upgrade/upgrade_history_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_history_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_history_view_test.js index 8a89321..5544cef 100644 --- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_history_view_test.js +++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_history_view_test.js @@ -294,15 +294,17 @@ describe('App.MainAdminStackUpgradeHistoryView', function () { var versions = { S1: { from_repository_id: 1, - to_repository_id: 2 + to_repository_id: 2, + from_repository_version: '1.123.123-1', + to_repository_version: '1.123.123-2' } }; expect(view.getRepoServicesForDisplay(versions)).to.be.eql([ { name: 'S1', displayName: 's1', - fromVersion: '1.1', - toVersion: '1.1' + fromVersion: '1.123.123-1', + toVersion: '1.123.123-2' } ]); });
