浏览代码

AMBARI-20700 - UI should use the URL as-given by the backend (rzang)

Change-Id: I308c7b8d3eed2ba9218d26d2d2590dba9fe49f74
Richard Zang 8 年之前
父节点
当前提交
7643475cd0
共有 1 个文件被更改,包括 2 次插入12 次删除
  1. 2 12
      ambari-web/app/controllers/installer.js

+ 2 - 12
ambari-web/app/controllers/installer.js

@@ -707,6 +707,7 @@ App.InstallerController = App.WizardController.extend(App.UserPref, {
    */
   getSupportedOSListSuccessCallback: function (response, request, data) {
     var self = this;
+    var stack_default = data.versionDefinition.VersionDefinition.stack_default;
     var existedOS = data.versionDefinition.operating_systems;
     var existedMap = {};
     existedOS.map(function (existedOS) {
@@ -720,8 +721,7 @@ App.InstallerController = App.WizardController.extend(App.UserPref, {
           repo.Repositories.base_url = '';
         });
         existedOS.push(supportedOS);
-      }
-      if(existedMap[supportedOS.OperatingSystems.os_type]) {
+      } else if (stack_default) { // only overwrite if it is stack default, otherwise use url from /version_definition
         existedMap[supportedOS.OperatingSystems.os_type].repositories.forEach(function (repo) {
           supportedOS.repositories.forEach(function (supportedRepo) {
             if (supportedRepo.Repositories.repo_id == repo.Repositories.repo_id) {
@@ -754,16 +754,6 @@ App.InstallerController = App.WizardController.extend(App.UserPref, {
           this.setSelected(data.stackInfo.isStacksExistInDb);
         }
       }
-      // log diagnosis data for abnormal number of repos
-      var post_diagnosis = false;
-      data.versionDefinition.operating_systems.map(function(item) {
-        if (item.repositories.length > 2) {
-          post_diagnosis = true;
-        }
-      });
-      if (post_diagnosis) {
-        this.postUserPref('stack_response_diagnosis', data);
-      }
     }
   },