Repository: ambari Updated Branches: refs/heads/trunk 54cdd41f5 -> 6aca7feac
AMBARI-21414 After Upgrading From non-HDP to HDP the Stacks/Versions Page Allows Upgrade Back to non-HDP. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6aca7fea Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6aca7fea Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6aca7fea Branch: refs/heads/trunk Commit: 6aca7feaca55929b64725e44a3bbf123d6adfcfb Parents: 54cdd41 Author: Andrii Tkach <[email protected]> Authored: Tue Jul 25 17:42:21 2017 +0300 Committer: Andrii Tkach <[email protected]> Committed: Tue Jul 25 17:42:21 2017 +0300 ---------------------------------------------------------------------- .../main/admin/stack_upgrade/versions_view.js | 2 +- .../admin/stack_upgrade/version_view_test.js | 26 +++++++++++--------- 2 files changed, 16 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6aca7fea/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 cbaf26a..71edc7d 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 @@ -173,7 +173,7 @@ App.MainAdminStackVersionsView = Em.View.extend({ if (v.get('stackVersionType') === Em.get(currentVersion, 'stack_name')) { return stringUtils.compareVersions(v.get('repositoryVersion'), Em.get(currentVersion, 'repository_version')) >= 0; } - return true; + return v.get('isCompatible'); }).toArray(); } }, http://git-wip-us.apache.org/repos/asf/ambari/blob/6aca7fea/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js index cedec96..a535d13 100644 --- a/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js +++ b/ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js @@ -56,18 +56,20 @@ describe('App.mainAdminStackVersionsView', function () { }), Em.Object.create({ status: "INSTALLED", - repositoryVersion: "2.2.0.1", - stackVersionType: 'HDP' + repositoryVersion: "2.0.2.1", + stackVersionType: 'HCP', + isCompatible: true }), Em.Object.create({ status: "INSTALLED", - repositoryVersion: "2.2.2.1", - stackVersionType: 'HDP' + repositoryVersion: "2.0.2.2", + stackVersionType: 'HCP', + isCompatible: false }), Em.Object.create({ status: "INSTALLED", - repositoryVersion: "2.0.2.1", - stackVersionType: 'HCP' + repositoryVersion: "2.2.2.1", + stackVersionType: 'HDP' }), Em.Object.create({ status: "INSTALLED", @@ -114,13 +116,14 @@ describe('App.mainAdminStackVersionsView', function () { }), Em.Object.create({ status: "INSTALLED", - repositoryVersion: "2.2.2.1", - stackVersionType: 'HDP' + repositoryVersion: "2.0.2.1", + stackVersionType: 'HCP', + isCompatible: true }), Em.Object.create({ status: "INSTALLED", - repositoryVersion: "2.0.2.1", - stackVersionType: 'HCP' + repositoryVersion: "2.2.2.1", + stackVersionType: 'HDP' }), Em.Object.create({ status: "INSTALLED", @@ -185,7 +188,8 @@ describe('App.mainAdminStackVersionsView', function () { Em.Object.create({ status: "INSTALLED", repositoryVersion: "2.0.2.1", - stackVersionType: 'HCP' + stackVersionType: 'HCP', + isCompatible: true }) ] },
