You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/11/04 19:58:45 UTC
git commit: AMBARI-7036 restrict /#/experimental to only
AMBARI.ADMIN.3 (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 6bbecfd9e -> ef9fdf3a4
AMBARI-7036 restrict /#/experimental to only AMBARI.ADMIN.3 (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ef9fdf3a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ef9fdf3a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ef9fdf3a
Branch: refs/heads/branch-1.7.0
Commit: ef9fdf3a43c3b2442956b39b1ef1e2988903ffb7
Parents: 6bbecfd
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Tue Nov 4 20:38:18 2014 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Tue Nov 4 20:38:18 2014 +0200
----------------------------------------------------------------------
ambari-web/app/router.js | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ef9fdf3a/ambari-web/app/router.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/router.js b/ambari-web/app/router.js
index 9c27ba9..7509908 100644
--- a/ambari-web/app/router.js
+++ b/ambari-web/app/router.js
@@ -469,14 +469,22 @@ App.Router = Em.Router.extend({
experimental: Em.Route.extend({
route: '/experimental',
enter: function (router, context) {
- if (!App.get('isAdmin') || App.get('isOperator')) {
+ if (App.get('isOperator')) {
Em.run.next(function () {
- router.transitionTo("main.dashboard.widgets");
+ if (router.get('clusterInstallCompleted')) {
+ router.transitionTo("main.dashboard.widgets");
+ } else {
+ router.route("installer");
+ }
+ });
+ } else if (!App.get('isAdmin')) {
+ Em.run.next(function () {
+ router.transitionTo("main.views.index");
});
}
},
connectOutlets: function (router, context) {
- if (App.get('isAdmin')) {
+ if (App.get('isAdmin') && !App.get('isOperator')) {
$('title').text("Ambari Experimental");
console.log('/experimental:connectOutlet');
router.get('applicationController').connectOutlet('experimental');