You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2017/07/06 12:49:56 UTC
ambari git commit: AMBARI-21414 After Upgrading From non-HDP to HDP
the Stacks/Versions Page Allows Upgrade Back to non-HDP. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-21348 d0c147973 -> e36c11b68
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/e36c11b6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e36c11b6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e36c11b6
Branch: refs/heads/branch-feature-AMBARI-21348
Commit: e36c11b6828a4f442e13308469b1ebfbeb9e7237
Parents: d0c1479
Author: Andrii Tkach <at...@apache.org>
Authored: Thu Jul 6 12:56:52 2017 +0300
Committer: Andrii Tkach <at...@apache.org>
Committed: Thu Jul 6 12:56:52 2017 +0300
----------------------------------------------------------------------
.../views/main/admin/stack_upgrade/versions_view.js | 2 +-
.../main/admin/stack_upgrade/version_view_test.js | 15 ++++++++++++---
2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e36c11b6/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 5ad5814..c87cb81 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/e36c11b6/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 d9f7e0c..cf9906f 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
@@ -57,7 +57,14 @@ describe('App.mainAdminStackVersionsView', function () {
Em.Object.create({
status: "INSTALLED",
repositoryVersion: "2.0.2.1",
- stackVersionType: 'HCP'
+ stackVersionType: 'HCP',
+ isCompatible: true
+ }),
+ Em.Object.create({
+ status: "INSTALLED",
+ repositoryVersion: "2.0.2.2",
+ stackVersionType: 'HCP',
+ isCompatible: false
}),
Em.Object.create({
status: "INSTALLED",
@@ -115,7 +122,8 @@ describe('App.mainAdminStackVersionsView', function () {
Em.Object.create({
status: "INSTALLED",
repositoryVersion: "2.0.2.1",
- stackVersionType: 'HCP'
+ stackVersionType: 'HCP',
+ isCompatible: true
}),
Em.Object.create({
status: "INSTALLED",
@@ -185,7 +193,8 @@ describe('App.mainAdminStackVersionsView', function () {
Em.Object.create({
status: "INSTALLED",
repositoryVersion: "2.0.2.1",
- stackVersionType: 'HCP'
+ stackVersionType: 'HCP',
+ isCompatible: true
})
]
},