ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From me...@apache.org
Subject ranger git commit: RANGER-1708 : Remove tag services from service type and service name filters under Access Audit.
Date Mon, 07 Aug 2017 05:04:42 GMT
Repository: ranger
Updated Branches:
  refs/heads/master 93c900c34 -> c5daf83bc


RANGER-1708 : Remove tag services from service type and service name filters under Access
Audit.


Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/c5daf83b
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/c5daf83b
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/c5daf83b

Branch: refs/heads/master
Commit: c5daf83bc225a6249022e23fd0cbcadeb56a0987
Parents: 93c900c
Author: Nitin Galave <nitin.galave@gmail.com>
Authored: Mon Jul 24 11:17:14 2017 +0530
Committer: Mehul Parikh <mehul@apache.org>
Committed: Mon Aug 7 10:30:40 2017 +0530

----------------------------------------------------------------------
 .../webapp/scripts/views/reports/AuditLayout.js   | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ranger/blob/c5daf83b/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js b/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js
index 40f56dd..68be81e 100644
--- a/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js
+++ b/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js
@@ -320,15 +320,25 @@ define(function(require) {
 						
 						switch (facet) {
 							case 'Service Name':
-								var serviceList 	= new RangerServiceList();
+								var serviceList 	= new RangerServiceList() , serviceNameVal = [];
 								serviceList.setPageSize(100);
 								serviceList.fetch().done(function(){
-									callback(serviceList.map(function(model){return model.get('name');}));
+								serviceList.each(function(m){
+									if(m.get('type') !== XAEnums.ServiceType.SERVICE_TAG.label){
+										serviceNameVal.push(m.get('name'));
+									};
+								});
+								callback(serviceNameVal);
 								});
 								break;
 							case 'Service Type':
-								var serviceList =  that.serviceDefList.map(function(serviceDef){ return {'label'
: serviceDef.get('name').toUpperCase(), 'value' : serviceDef.get('name').toUpperCase()}; })
-								callback(serviceList);
+								var serviveDefs = [];
+								that.serviceDefList.each(function(m){
+									if(m.get('name').toUpperCase() != (XAEnums.ServiceType.SERVICE_TAG.label).toUpperCase()){
+										serviveDefs.push({ 'label' : m.get('name').toUpperCase(), 'value' : m.get('name').toUpperCase()
});
+									}
+								});
+								callback(serviveDefs);
 								break;
 							case 'Result':
 				                callback(XAUtils.hackForVSLabelValuePairs(XAEnums.AccessResult));


Mime
View raw message