Explorar o código

AMBARI-7944. Admin View: the user is allowed to go to the dashboard while cluster deploy is happening. (Levgen Gorbachev via akovalenko)

Aleksandr Kovalenko %!s(int64=10) %!d(string=hai) anos
pai
achega
f30729d2db

+ 1 - 0
ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/mainCtrl.js

@@ -58,6 +58,7 @@ angular.module('ambariAdminConsole')
     });
   };
   loadClusterData();
+
   $scope.viewInstances = [];
   View.getAllVisibleInstance().then(function(instances) {
     $scope.viewInstances = instances;

+ 1 - 1
ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js

@@ -90,7 +90,7 @@ angular.module('ambariAdminConsole')
   dashboard:{
     url: '/dashboard',
     controller: ['$window', function($window) {
-      $window.location.href = '/#/main/dashboard';
+      $window.location.replace('/#/main/dashboard');
     }],
     template: ''
   }

+ 4 - 1
ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css

@@ -829,7 +829,10 @@ table.no-border tr td{
 .btn-primary:active,
 .btn-primary.active,
 .btn-primary.disabled,
-.btn-primary[disabled] {
+.btn-primary[disabled],
+.btn-primary.disabled:hover,
+.btn-primary[disabled]:hover
+ {
   color: #ffffff;
   background-color: #0044cc;
   *background-color: #003bb3;

+ 9 - 3
ambari-admin/src/main/resources/ui/admin-web/app/views/main.html

@@ -28,8 +28,14 @@
         <div class="description">Manage the configuration of your cluster and monitor the health of your services</div>
         <div class="glyphicon glyphicon-cloud"></div>
         <div class="buttons">
-        <span ng-class="{active: isActive('clusters.manageAccess')}"><a href="#/clusters/{{cluster.Clusters.cluster_name}}/manageAccess" class="btn btn-primary permission-button" ng-disabled="cluster.Clusters.provisioning_state != 'INSTALLED' ">Manage Permissions</a></span>
-          <span><a href="/#/main/dashboard" class="btn btn-primary go-dashboard-button" target="{{cluster.Clusters.cluster_name}}" ng-disabled="cluster.Clusters.provisioning_state != 'INSTALLED' ">Go to Dashboard</a></span>
+        <span ng-class="{active: isActive('clusters.manageAccess')}">
+          <a ng-show="cluster.Clusters.provisioning_state != 'INSTALLED'" href class="btn btn-primary permission-button" ng-disabled="cluster.Clusters.provisioning_state != 'INSTALLED' ">Manage Permissions</a>
+          <a ng-show="cluster.Clusters.provisioning_state == 'INSTALLED'" href="#/clusters/{{cluster.Clusters.cluster_name}}/manageAccess" class="btn btn-primary permission-button" ng-disabled="cluster.Clusters.provisioning_state != 'INSTALLED' ">Manage Permissions</a>
+        </span>
+        <span>
+          <a ng-show="cluster.Clusters.provisioning_state != 'INSTALLED'" href class="btn btn-primary go-dashboard-button" target="{{cluster.Clusters.cluster_name}}" ng-disabled="cluster.Clusters.provisioning_state != 'INSTALLED' ">Go to Dashboard</a>
+          <a ng-show="cluster.Clusters.provisioning_state == 'INSTALLED'" href="'/#/main/dashboard/metrics'" class="btn btn-primary go-dashboard-button" target="{{cluster.Clusters.cluster_name}}" ng-disabled="cluster.Clusters.provisioning_state != 'INSTALLED' ">Go to Dashboard</a>
+        </span>
         </div>
       </div>
       <div ng-hide="cluster" class="col-sm-11 thumbnail">
@@ -59,4 +65,4 @@
         </div>
       </div>
   </div>
-</div>
+</div>