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-12304. Summary:500 error when attempting to add service (Extra fix for refreshing issue) (rzang)
Date Wed, 08 Jul 2015 22:40:28 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 1d84518f8 -> fc0569be6


AMBARI-12304. Summary:500 error when attempting to add service (Extra fix for refreshing issue)
(rzang)


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

Branch: refs/heads/branch-2.1
Commit: fc0569be672d26774f106ba6b24430b324d1154f
Parents: 1d84518
Author: Richard Zang <rzang@apache.org>
Authored: Wed Jul 8 15:36:31 2015 -0700
Committer: Richard Zang <rzang@apache.org>
Committed: Wed Jul 8 15:39:25 2015 -0700

----------------------------------------------------------------------
 ambari-web/app/routes/installer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/fc0569be/ambari-web/app/routes/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/installer.js b/ambari-web/app/routes/installer.js
index 31b8038..c57da9c 100644
--- a/ambari-web/app/routes/installer.js
+++ b/ambari-web/app/routes/installer.js
@@ -286,8 +286,6 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
             controller.setDBProperty('serviceConfigGroups', null);
             controller.setDBProperty('recommendationsHostGroups', wizardStep6Controller.get('content.recommendationsHostGroups'));
             controller.setDBProperty('recommendationsConfigs', null);
-            controller.loadAdvancedConfigs(wizardStep7Controller);
-            wizardStep7Controller.set('isAdvancedConfigLoaded', false);
             router.transitionTo('step7');
           }
         });
@@ -307,6 +305,8 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
 
       controller.loadAllPriorSteps().done(function () {
         var wizardStep7Controller = router.get('wizardStep7Controller');
+        controller.loadAdvancedConfigs(wizardStep7Controller);
+        wizardStep7Controller.set('isAdvancedConfigLoaded', false);
         wizardStep7Controller.set('wizardController', controller);
         controller.connectOutlet('wizardStep7', controller.get('content'));
       });


Mime
View raw message