|
@@ -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');
|