Repository: ambari Updated Branches: refs/heads/branch-2.4 7c12d667a -> 61617dce3
AMBARI-16723 Stack id needs to be handled differently according to its source (zhewang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/61617dce Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/61617dce Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/61617dce Branch: refs/heads/branch-2.4 Commit: 61617dce31bdf9321c57046f7816ff08db4162c1 Parents: 7c12d66 Author: Zhe (Joe) Wang <[email protected]> Authored: Wed May 18 14:32:28 2016 -0400 Committer: Zhe (Joe) Wang <[email protected]> Committed: Wed May 18 14:37:06 2016 -0400 ---------------------------------------------------------------------- ambari-web/app/controllers/installer.js | 4 +++- ambari-web/app/mappers/stack_mapper.js | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/61617dce/ambari-web/app/controllers/installer.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js index 421f2dc..d8000c7 100644 --- a/ambari-web/app/controllers/installer.js +++ b/ambari-web/app/controllers/installer.js @@ -605,6 +605,7 @@ App.InstallerController = App.WizardController.extend({ var data = _data.resources[0]; var self = this; // load the data info to display for details and contents panel + data.VersionDefinition.id = dataInfo.data.VersionDefinition.available; var response = { id : data.VersionDefinition.id, stackVersion : data.VersionDefinition.stack_version, @@ -733,7 +734,8 @@ App.InstallerController = App.WizardController.extend({ this.postVersionDefinitionFile(versionData.isXMLdata, versionData.data).done(function (versionInfo) { self.mergeChanges(data.stackInfo.repos, data.stackInfo.stacks); App.Stack.find().setEach('isSelected', false); - App.Stack.find().findProperty('id', versionInfo.stackNameVersion + "-" + versionInfo.actualVersion).set('isSelected', true); + var stackId = versionData.data.VersionDefinition.available || versionInfo.stackNameVersion + "-" + versionInfo.actualVersion; + App.Stack.find().findProperty('id', stackId).set('isSelected', true); self.setSelected(data.stackInfo.isStacksExistInDb); }); } else { http://git-wip-us.apache.org/repos/asf/ambari/blob/61617dce/ambari-web/app/mappers/stack_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/stack_mapper.js b/ambari-web/app/mappers/stack_mapper.js index 473c466..ab1d6a8 100644 --- a/ambari-web/app/mappers/stack_mapper.js +++ b/ambari-web/app/mappers/stack_mapper.js @@ -99,6 +99,10 @@ App.stackMapper = App.QuickDataMapper.create({ var operatingSystemsArray = []; var servicesArray = []; + if (!stack.id) { + stack.id = stack.stack_name + "-" + stack.stack_version + "-" + stack.repository_version; //HDP-2.5-2.5.0.0 + } + item.operating_systems.forEach(function(ops) { var operatingSystems = ops.OperatingSystems;
