Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 f5df03a9e -> 2355ee6c4


AMBARI-18566 Installer wizard-> Select Versions page: Selecting Red Hat 
Satellite option and clicking next button makes wizard stuck (zhewang)


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

Branch: refs/heads/branch-2.5
Commit: 2355ee6c47f2116fa5b8150b658f153e3e41ec63
Parents: f5df03a
Author: Zhe (Joe) Wang <zhew...@apache.org>
Authored: Wed Oct 12 13:50:01 2016 -0700
Committer: Zhe (Joe) Wang <zhew...@apache.org>
Committed: Wed Oct 12 13:52:20 2016 -0700

----------------------------------------------------------------------
 ambari-web/app/controllers/installer.js   | 3 +++
 ambari-web/app/views/wizard/step1_view.js | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2355ee6c/ambari-web/app/controllers/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/installer.js 
b/ambari-web/app/controllers/installer.js
index f8f70a0..5493b3a 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -831,6 +831,9 @@ App.InstallerController = App.WizardController.extend({
         return os.get('repositories.length');
       }).reduce(Em.sum, 0));
       var verifyBaseUrl = !wizardStep1Controller.get('skipValidationChecked') 
&& !wizardStep1Controller.get('selectedStack.useRedhatSatellite');
+      if (!verifyBaseUrl) {
+        dfd.resolve();
+      }
       selectedStack.get('operatingSystems').forEach(function (os) {
         if (os.get('isSelected') && !os.get('isEmpty')) {
           os.get('repositories').forEach(function (repo) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/2355ee6c/ambari-web/app/views/wizard/step1_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/step1_view.js 
b/ambari-web/app/views/wizard/step1_view.js
index 2b80ad5..bfabc02 100644
--- a/ambari-web/app/views/wizard/step1_view.js
+++ b/ambari-web/app/views/wizard/step1_view.js
@@ -76,7 +76,13 @@ App.WizardStep1View = Em.View.extend({
    *
    * @type {bool}
    */
-  showWarning: Em.computed.or('invalidFormatUrlExist', 'isNoOsChecked', 
'isNoOsFilled'),
+  warningExist: Em.computed.or('invalidFormatUrlExist', 'isNoOsChecked', 
'isNoOsFilled'),
+
+  skipVerifyBaseUrl: 
Em.computed.or('controller.selectedStack.skipValidationChecked', 
'controller.selectedStack.useRedhatSatellite'),
+
+  verifyBaseUrl: Em.computed.not('skipVerifyBaseUrl'),
+
+  showWarning: Em.computed.and('warningExist', 'verifyBaseUrl'),
 
   /**
    * Onclick handler for recheck repos urls. Used in Advanced Repository 
Options.

Reply via email to