ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject [1/2] ambari git commit: AMBARI-11794. RU: during upgrade reopening of browser sends to strange page (alexantonenko)
Date Mon, 08 Jun 2015 21:33:45 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 094da61f1 -> 2488fa8bc


AMBARI-11794. RU: during upgrade reopening of browser sends to strange page (alexantonenko)


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

Branch: refs/heads/branch-2.1
Commit: 2488fa8bcea8bf178100e7e70a760b25f8735bd5
Parents: ddecdd1
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Mon Jun 8 22:17:08 2015 +0300
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Tue Jun 9 00:27:39 2015 +0300

----------------------------------------------------------------------
 ambari-web/app/data/controller_route.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2488fa8b/ambari-web/app/data/controller_route.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/controller_route.js b/ambari-web/app/data/controller_route.js
index b324b51..d6319f5 100644
--- a/ambari-web/app/data/controller_route.js
+++ b/ambari-web/app/data/controller_route.js
@@ -63,7 +63,7 @@ module.exports = [
   },
   {
     wizardControllerName: App.router.get('mainAdminStackAndUpgradeController.name'),
-    route: 'main.admin.stackAndUpgrade'
+    route: App.db.get('MainAdminStackAndUpgrade', 'upgradeState') == 'INIT' ? 'main.admin.stackAndUpgrade.index'
: 'main.admin.stackAndUpgrade.versions'
   },
   {
     wizardControllerName: App.router.get('widgetWizardController.name'),


Mime
View raw message