Repository: ambari Updated Branches: refs/heads/trunk a2c23b213 -> 78037086e
AMBARI-17322 No alerts on Select Version page when selected stack 2.2 with JDK 1.8 (zhewang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/78037086 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/78037086 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/78037086 Branch: refs/heads/trunk Commit: 78037086ee492e067380aba5113034f7312bdb5d Parents: a2c23b2 Author: Zhe (Joe) Wang <[email protected]> Authored: Tue Jun 21 10:16:26 2016 -0700 Committer: Zhe (Joe) Wang <[email protected]> Committed: Tue Jun 21 10:17:13 2016 -0700 ---------------------------------------------------------------------- ambari-web/app/models/stack.js | 2 ++ ambari-web/app/utils/ajax/ajax.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/78037086/ambari-web/app/models/stack.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/stack.js b/ambari-web/app/models/stack.js index 5081f19..dbc2d72 100644 --- a/ambari-web/app/models/stack.js +++ b/ambari-web/app/models/stack.js @@ -23,6 +23,8 @@ App.Stack = DS.Model.extend({ stackName: DS.attr('string'), stackVersion: DS.attr('string'), stackDefault: DS.attr('boolean'), + minJdkVersion: DS.attr('string'), + maxJdkVersion: DS.attr('string'), repositoryVersion: DS.attr('string'), showAvailable: DS.attr('boolean'), // All of the instances should have this value to true. We should map only those stacks that has this flag set to true type: DS.attr('string'), // ["PATCH", "STANDARD"] http://git-wip-us.apache.org/repos/asf/ambari/blob/78037086/ambari-web/app/utils/ajax/ajax.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js index e5b8e34..89894ac 100644 --- a/ambari-web/app/utils/ajax/ajax.js +++ b/ambari-web/app/utils/ajax/ajax.js @@ -2202,7 +2202,7 @@ var urls = { }, 'wizard.stacks_versions_definitions': { - 'real': '/version_definitions?fields=VersionDefinition/stack_default,operating_systems/repositories/Repositories/*,operating_systems/OperatingSystems/*,VersionDefinition/stack_services,VersionDefinition/repository_version' + + 'real': '/version_definitions?fields=VersionDefinition/stack_default,VersionDefinition/max_jdk,VersionDefinition/min_jdk,operating_systems/repositories/Repositories/*,operating_systems/OperatingSystems/*,VersionDefinition/stack_services,VersionDefinition/repository_version' + '&VersionDefinition/show_available=true&VersionDefinition/stack_name={stackName}', 'mock': '/data/wizard/stack/{stackName}_version_definitions.json' },
