Repository: ambari Updated Branches: refs/heads/trunk dd0ae15bc -> 807f3c885
AMBARI-7865. About popup missing Ambari version (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/807f3c88 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/807f3c88 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/807f3c88 Branch: refs/heads/trunk Commit: 807f3c885528c13382749c82b69094e9830627c8 Parents: dd0ae15 Author: Alex Antonenko <hiv...@gmail.com> Authored: Mon Oct 20 18:39:35 2014 +0300 Committer: Alex Antonenko <hiv...@gmail.com> Committed: Mon Oct 20 20:24:42 2014 +0300 ---------------------------------------------------------------------- ambari-web/app/routes/main.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/807f3c88/ambari-web/app/routes/main.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js index 668954b..25f1714 100644 --- a/ambari-web/app/routes/main.js +++ b/ambari-web/app/routes/main.js @@ -26,22 +26,22 @@ module.exports = Em.Route.extend({ console.log('in /main:enter'); router.getAuthenticated().done(function (loggedIn) { if (loggedIn) { - App.router.get('mainViewsController').loadAmbariViews(); - App.router.get('clusterController').loadClusterName(false).done(function () { - if (App.get('testMode')) { - router.get('mainController').initialize(); - } else { - if (router.get('clusterInstallCompleted')) { - App.router.get('mainController').checkServerClientVersion().done(function () { + App.router.get('mainController').checkServerClientVersion().done(function () { + App.router.get('mainViewsController').loadAmbariViews(); + App.router.get('clusterController').loadClusterName(false).done(function () { + if (App.get('testMode')) { + router.get('mainController').initialize(); + } else { + if (router.get('clusterInstallCompleted')) { App.router.get('clusterController').loadClientServerClockDistance().done(function () { router.get('mainController').initialize(); }); - }); - } - else { - App.router.get('clusterController').set('isLoaded', true); + } + else { + App.router.get('clusterController').set('isLoaded', true); + } } - } + }); }); // TODO: redirect to last known state } else {
