Selaa lähdekoodia

AMBARI-15261. Hide Admin Settings / Login Message features (alexantonenko)

Alex Antonenko 9 vuotta sitten
vanhempi
commit
9df2eb74e5

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

@@ -29,7 +29,8 @@ angular.module('ambariAdminConsole', [
 	baseUrl: '/api/v1',
   testMode: (window.location.port == 8000),
   mockDataPrefix: 'assets/data/',
-  isLDAPConfigurationSupported: false
+  isLDAPConfigurationSupported: false,
+  isLoginActivitiesSupported: false
 })
 .config(['RestangularProvider', '$httpProvider', '$provide', function(RestangularProvider, $httpProvider, $provide) {
   // Config Ajax-module

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

@@ -154,4 +154,9 @@ angular.module('ambariAdminConsole')
       e.preventDefault();
     }
   });
+  $rootScope.$on('$locationChangeStart', function (e, nextUrl) {
+    if ((/\/loginMessage$/.test(nextUrl) || /\/homeDirectory$/.test(nextUrl)) && !Settings.isLoginActivitiesSupported) {
+      e.preventDefault();
+    }
+  });
 }]);

+ 2 - 2
ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html

@@ -105,12 +105,12 @@
     </div>
   </div>
 
-  <div class="panel panel-default">
+  <div class="panel panel-default" ng-show="settings.isLoginActivitiesSupported || settings.isLDAPConfigurationSupported">
     <div class="panel-heading"><span class="glyphicon glyphicon-cog"></span> {{'common.settings' | translate}}</div>
     <div class="panel-body">
       <ul class="nav nav-pills nav-stacked">
         <li ng-class="{active: isActive('authentication.main')}" ng-show="settings.isLDAPConfigurationSupported"><link-to route="authentication.main">{{'common.authentication' | translate}}</link-to></li>
-        <li ng-class="{active: isActive('loginActivities.loginMessage')}"><link-to route="loginActivities.loginMessage">{{'common.loginActivities.loginActivities' | translate}}</link-to></li>
+        <li ng-class="{active: isActive('loginActivities.loginMessage')}" ng-show="settings.isLoginActivitiesSupported"><link-to route="loginActivities.loginMessage">{{'common.loginActivities.loginActivities' | translate}}</link-to></li>
       </ul>
     </div>
   </div>