ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rz...@apache.org
Subject ambari git commit: AMBARI-20700 - UI should use the URL as-given by the backend (rzang)
Date Tue, 11 Apr 2017 20:21:43 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 08b263150 -> 7643475cd


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

Change-Id: I308c7b8d3eed2ba9218d26d2d2590dba9fe49f74


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7643475c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7643475c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7643475c

Branch: refs/heads/branch-2.5
Commit: 7643475cd058711f9c6b07c8dcf1c04560dc49d1
Parents: 08b2631
Author: Richard Zang <rzang@apache.org>
Authored: Tue Apr 11 13:10:28 2017 -0700
Committer: Richard Zang <rzang@apache.org>
Committed: Tue Apr 11 13:18:24 2017 -0700

----------------------------------------------------------------------
 ambari-web/app/controllers/installer.js | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7643475c/ambari-web/app/controllers/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js
index 35056f7..b30f864 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/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);
-      }
     }
   },
 


Mime
View raw message