Sfoglia il codice sorgente

AMBARI-16723 Stack id needs to be handled differently according to its source (zhewang)

Zhe (Joe) Wang 9 anni fa
parent
commit
61617dce31

+ 3 - 1
ambari-web/app/controllers/installer.js

@@ -605,6 +605,7 @@ App.InstallerController = App.WizardController.extend({
       var data = _data.resources[0];
       var data = _data.resources[0];
       var self = this;
       var self = this;
       // load the data info to display for details and contents panel
       // load the data info to display for details and contents panel
+      data.VersionDefinition.id = dataInfo.data.VersionDefinition.available;
       var response = {
       var response = {
         id : data.VersionDefinition.id,
         id : data.VersionDefinition.id,
         stackVersion : data.VersionDefinition.stack_version,
         stackVersion : data.VersionDefinition.stack_version,
@@ -733,7 +734,8 @@ App.InstallerController = App.WizardController.extend({
           this.postVersionDefinitionFile(versionData.isXMLdata, versionData.data).done(function (versionInfo) {
           this.postVersionDefinitionFile(versionData.isXMLdata, versionData.data).done(function (versionInfo) {
             self.mergeChanges(data.stackInfo.repos, data.stackInfo.stacks);
             self.mergeChanges(data.stackInfo.repos, data.stackInfo.stacks);
             App.Stack.find().setEach('isSelected', false);
             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);
             self.setSelected(data.stackInfo.isStacksExistInDb);
           });
           });
         } else {
         } else {

+ 4 - 0
ambari-web/app/mappers/stack_mapper.js

@@ -99,6 +99,10 @@ App.stackMapper = App.QuickDataMapper.create({
     var operatingSystemsArray = [];
     var operatingSystemsArray = [];
     var servicesArray = [];
     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) {
     item.operating_systems.forEach(function(ops) {
       var operatingSystems = ops.OperatingSystems;
       var operatingSystems = ops.OperatingSystems;