This is an automated email from the ASF dual-hosted git repository. ni3galave pushed a commit to branch ranger-2.2 in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 77091940b1b032ec11ff6d3707959621cb6f33f5 Author: Nitin Galave <[email protected]> AuthorDate: Tue Apr 27 18:09:07 2021 +0530 RANGER-3062 : Even after removing ‘Security Zone’ permission for an user, UI still shows ‘Security Zone’ tab. --- .../src/main/webapp/scripts/utils/XAGlobals.js | 1 + .../main/webapp/scripts/views/common/ErrorView.js | 2 + .../main/webapp/templates/common/TopNav_tmpl.html | 44 ++++++++++++---------- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/security-admin/src/main/webapp/scripts/utils/XAGlobals.js b/security-admin/src/main/webapp/scripts/utils/XAGlobals.js index 5132e8f..4b0c98e 100644 --- a/security-admin/src/main/webapp/scripts/utils/XAGlobals.js +++ b/security-admin/src/main/webapp/scripts/utils/XAGlobals.js @@ -72,6 +72,7 @@ define(function(require){ 'Encryption' : {'Key Manager' : ['kmsManagerAction','kmsKeyCreateAction'] }, 'Settings' : {'Users/Groups' : ['userManagerAction','userCreateAction','userEditAction','groupCreateAction','groupEditAction'], 'Permissions' : ['modulePermissionsAction','modulePermissionEditAction'] }, + 'Security Zone' : ['zoneManagmentAction', 'RangerZoneCreateAction', 'RangerZoneEditAction'], }; XAGlobals.ActionType = { diff --git a/security-admin/src/main/webapp/scripts/views/common/ErrorView.js b/security-admin/src/main/webapp/scripts/views/common/ErrorView.js index f0a60ad..63dceb7 100644 --- a/security-admin/src/main/webapp/scripts/views/common/ErrorView.js +++ b/security-admin/src/main/webapp/scripts/views/common/ErrorView.js @@ -74,6 +74,7 @@ define(function(require){ onRender: function() { this.initializePlugins(); $('#r_breadcrumbs').hide(); + $('.latestResponse').hide(); var msg = '', moreInfo = ''; if(this.status == 401){ msg = 'Access Denied (401)'; @@ -108,6 +109,7 @@ define(function(require){ /** on close */ onClose: function(){ $('#r_breadcrumbs').show(); + $('.latestResponse').show(); } }); diff --git a/security-admin/src/main/webapp/templates/common/TopNav_tmpl.html b/security-admin/src/main/webapp/templates/common/TopNav_tmpl.html index 4b22f6c..3991414 100644 --- a/security-admin/src/main/webapp/templates/common/TopNav_tmpl.html +++ b/security-admin/src/main/webapp/templates/common/TopNav_tmpl.html @@ -44,16 +44,18 @@ {{/hasAccessToTab}} </ul> </li> - {{^hideSecurityZoneTab}} - <li> - <a href="#!/zones/zone/list" id="nav6"> - <span class="zone-icon fa-stack fa-lg"> - <i class="fa fa-square-o fa-stack-2x"></i> - <i class="fa fa-bolt fa-stack-1x"></i> - </span>{{tt 'h.securityZone'}} - </a> - </li> - {{/hideSecurityZoneTab}} + {{#hasAccessToTab 'Security Zone'}} + {{^hideSecurityZoneTab}} + <li> + <a href="#!/zones/zone/list" id="nav6"> + <span class="zone-icon fa-stack fa-lg"> + <i class="fa fa-square-o fa-stack-2x"></i> + <i class="fa fa-bolt fa-stack-1x"></i> + </span>{{tt 'h.securityZone'}} + </a> + </li> + {{/hideSecurityZoneTab}} + {{/hasAccessToTab}} <li class="dropdown"> <a href="javascript:;" id="nav5"><i class="fa-fw fa fa-gear"></i> {{tt 'h.settings'}} </a> <ul class="dropdown-menu"> @@ -89,16 +91,18 @@ {{/hasAccessToTab}} </ul> </li> - {{^hideSecurityZoneTab}} - <li> - <a href="#!/zones/zone/list" id="nav6"> - <span class="zone-icon fa-stack fa-lg"> - <i class="fa fa-square-o fa-stack-2x"></i> - <i class="fa fa-bolt fa-stack-1x"></i> - </span>{{tt 'h.securityZone'}} - </a> - </li> - {{/hideSecurityZoneTab}} + {{#hasAccessToTab 'Security Zone'}} + {{^hideSecurityZoneTab}} + <li> + <a href="#!/zones/zone/list" id="nav6"> + <span class="zone-icon fa-stack fa-lg"> + <i class="fa fa-square-o fa-stack-2x"></i> + <i class="fa fa-bolt fa-stack-1x"></i> + </span>{{tt 'h.securityZone'}} + </a> + </li> + {{/hideSecurityZoneTab}} + {{/hasAccessToTab}} {{#hasAccessToTab 'Users/Groups'}} <li><a href="#!/users/usertab" id="nav5"><i class="fa-fw fa fa-gear"></i> {{tt 'h.settings'}} </a></li> {{/hasAccessToTab}}
