Kaynağa Gözat

AMBARI-7036 restrict /#/experimental to only AMBARI.ADMIN.3 (ababiichuk)

aBabiichuk 10 yıl önce
ebeveyn
işleme
e302ffed4d
1 değiştirilmiş dosya ile 11 ekleme ve 3 silme
  1. 11 3
      ambari-web/app/router.js

+ 11 - 3
ambari-web/app/router.js

@@ -469,14 +469,22 @@ App.Router = Em.Router.extend({
     experimental: Em.Route.extend({
     experimental: Em.Route.extend({
       route: '/experimental',
       route: '/experimental',
       enter: function (router, context) {
       enter: function (router, context) {
-        if (!App.get('isAdmin') || App.get('isOperator')) {
+        if (App.get('isOperator')) {
           Em.run.next(function () {
           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) {
       connectOutlets: function (router, context) {
-        if (App.get('isAdmin')) {
+        if (App.get('isAdmin') && !App.get('isOperator')) {
           $('title').text("Ambari Experimental");
           $('title').text("Ambari Experimental");
           console.log('/experimental:connectOutlet');
           console.log('/experimental:connectOutlet');
           router.get('applicationController').connectOutlet('experimental');
           router.get('applicationController').connectOutlet('experimental');