You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by me...@apache.org on 2020/09/21 05:35:36 UTC

[ranger] branch ranger-2.2 updated: RANGER-3002 : Query info popup stuck in Ranger access audits view

This is an automated email from the ASF dual-hosted git repository.

mehul pushed a commit to branch ranger-2.2
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/ranger-2.2 by this push:
     new 312eeb4  RANGER-3002 : Query info popup stuck in Ranger access audits view
312eeb4 is described below

commit 312eeb4d816683e22844b4c59c3e7b9784a7ff3b
Author: Nitin Galave <ni...@apache.org>
AuthorDate: Thu Sep 17 17:40:23 2020 +0530

    RANGER-3002 : Query info popup stuck in Ranger access audits view
    
    Signed-off-by: Mehul Parikh <me...@apache.org>
---
 security-admin/src/main/webapp/scripts/utils/XAViewUtils.js | 6 ++++--
 security-admin/src/main/webapp/styles/xa.css                | 7 ++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/security-admin/src/main/webapp/scripts/utils/XAViewUtils.js b/security-admin/src/main/webapp/scripts/utils/XAViewUtils.js
index 02aaffc..8b67452 100644
--- a/security-admin/src/main/webapp/scripts/utils/XAViewUtils.js
+++ b/security-admin/src/main/webapp/scripts/utils/XAViewUtils.js
@@ -76,14 +76,16 @@ define(function(require) {
             var $elements = that.$el.find('table [data-name = "queryInfo"][data-id = "'+model.id+'"]');
             $elements.popover({
                 html: true,
-                title:'<b>' + (titleMap[model.get('serviceType')] || 'Request Data') + '</b>' +
-                '<button type="button"  id="queryInfoClose" class="close closeBtn" onclick="$(&quot;.queryInfo&quot;).popover(&quot;hide&quot;);">&times;</button>',
+                title: '<b class="custom-title">'+ (titleMap[model.get('serviceType')] || 'Request Data') +'</b><a href="javascript:void(0)" class="close popoverClose">&times;</a>',
                 content: msg,
                 selector : true,
                 container:'body',
                 placement: 'top'
             }).on("click", function(e){
                 e.stopPropagation();
+                $('.popoverClose').on("click", function(){
+                    $(this).parents(".popover").popover('hide');
+                });
                 if($(e.target).data('toggle') !== 'popover' && $(e.target).parents('.popover.in').length === 0){
                     $('.queryInfo').not(this).popover('hide');
                     $('.copyQuery').on("click", function(e){
diff --git a/security-admin/src/main/webapp/styles/xa.css b/security-admin/src/main/webapp/styles/xa.css
index 0823649..521b940 100644
--- a/security-admin/src/main/webapp/styles/xa.css
+++ b/security-admin/src/main/webapp/styles/xa.css
@@ -4446,7 +4446,12 @@ input.textFiledInputPadding:disabled {
 .modal-body {
   overflow-y: auto;
 }
-/*[fieldclass="resorces-css"] .control-label {
+
+.popover-header .close{
+  position: relative;
+  bottom: 6px;
+  cursor: pointer;
+}/*[fieldclass="resorces-css"] .control-label {
   margin-top: 0px;
   margin-right: -15px
 }*/