AMBARI-10117. Accessing view instances unavailable to admin users when no clusters are configured. (akovalenko)

ambari-web/app/routes/main.js

@@ -46,15 +46,14 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
                 Em.run.next(function () {
                   App.clusterStatus.updateFromServer().complete(function () {
                     var currentClusterStatus = App.clusterStatus.get('value');
-                    if (currentClusterStatus) {
-                      if (self.get('installerStatuses').contains(currentClusterStatus.clusterState)) {
-                        if (App.isAccessible('ADMIN')) {
-                          self.redirectToInstaller(router, currentClusterStatus, false);
-                        } else {
-                          Em.run.next(function () {
-                            App.router.transitionTo('main.views.index');
-                          });
-                        }
+                    if (router.get('currentState.parentState.name') !== 'views'
+                        && currentClusterStatus && self.get('installerStatuses').contains(currentClusterStatus.clusterState)) {
+                      if (App.isAccessible('ADMIN')) {
+                        self.redirectToInstaller(router, currentClusterStatus, false);
+                      } else {
+                        Em.run.next(function () {
+                          App.router.transitionTo('main.views.index');
+                        });
                       }
                     }
                   });