Repository: incubator-ranger Updated Branches: refs/heads/master 6618b9c2d -> 4a34f48af
RANGER-284 : Replace 'Agents' with 'Plugins' in Ranger Admin UI Signed-off-by: Velmurugan Periasamy <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/4435b434 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/4435b434 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/4435b434 Branch: refs/heads/master Commit: 4435b434f881deaee985603847545515e2ec17eb Parents: 6618b9c Author: Gautam Borad <[email protected]> Authored: Thu Mar 19 14:03:48 2015 +0530 Committer: Velmurugan Periasamy <[email protected]> Committed: Thu Mar 19 15:29:28 2015 -0400 ---------------------------------------------------------------------- .../src/main/webapp/scripts/modules/globalize/message/en.js | 8 ++++---- security-admin/src/main/webapp/scripts/utils/XAUtils.js | 6 ++++++ .../src/main/webapp/scripts/views/reports/AuditLayout.js | 6 +++--- 3 files changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/4435b434/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js index 1c7d803..9645216 100644 --- a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js +++ b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js @@ -164,8 +164,8 @@ define(function(require) { policyStatus : 'Policy Status', httpResponseCode : 'Http Response Code', repositoryName : 'Repository Name', - agentId : 'Agent Id', - agentIp : 'Agent IP', + agentId : 'Plugin Id', + agentIp : 'Plugin IP', createDate : 'Export Date', attributeName : 'Attribute Name', policyType : 'Policy Type', @@ -248,7 +248,7 @@ define(function(require) { manageTables : 'Manage Table', userProfile : 'User Profile', users : 'Users', - agents : 'Agents', + agents : 'Plugins', repository : 'Repository', policy : 'Policy', groups : 'Groups', @@ -259,7 +259,7 @@ define(function(require) { searchForYourAccessAudit :"Search for your access audits...", searchForYourAccessLog :"Search for your access logs...", searchForYourLoginSession :"Search for your login sessions...", - searchForYourAgent :"Search for your agents...", + searchForYourAgent :"Search for your plugins...", searchForPolicy :"Search for your policy...", searchForYourUser :"Search for your users...", searchForYourGroup :"Search for your groups...", http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/4435b434/security-admin/src/main/webapp/scripts/utils/XAUtils.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/utils/XAUtils.js b/security-admin/src/main/webapp/scripts/utils/XAUtils.js index fd39935..97e1081 100644 --- a/security-admin/src/main/webapp/scripts/utils/XAUtils.js +++ b/security-admin/src/main/webapp/scripts/utils/XAUtils.js @@ -528,6 +528,12 @@ define(function(require) { collection.VSQuery = query; search(searchCollection, serverAttrName, searchOpt,collection); }, + clearSearch: function(callback) { + _.each(serverAttrName, function(attr) { + delete collection.queryParams[attr.label]; + }); + callback(); + }, facetMatches : function(callback) { // console.log(visualSearch); var searchOptTemp = $.extend(true, [], searchOpt); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/4435b434/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 ed943bb..7f27f84 100644 --- a/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js +++ b/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js @@ -473,10 +473,10 @@ define(function(require) { addSearchForAgentTab : function(){ var that = this; //var searchOpt = _.pluck(this.getAgentColumns(), 'label'); - var searchOpt = ["Export Date", "Repository Name", "Agent Id", "Agent IP", "Http Response Code"]; + var searchOpt = ["Export Date", "Repository Name", "Plugin Id", "Plugin IP", "Http Response Code"]; searchOpt = _.without(searchOpt,'Export Date'); searchOpt = _.union(searchOpt, ['Start Date','End Date']);//'Today' - var serverAttrName = [{text : "Agent Id", label :"agentId"}, {text : "Agent IP", label :"clientIP"}, + var serverAttrName = [{text : "Plugin Id", label :"agentId"}, {text : "Plugin IP", label :"clientIP"}, {text : "Repository Name", label :"repositoryName"},{text : "Http Response Code", label :"httpRetCode"}, {text : "Export Date", label :"createDate"}, {text : 'Start Date',label :'startDate'},{text : 'End Date',label :'endDate'}, @@ -1167,7 +1167,7 @@ define(function(require) { gridOpts : { row : Backgrid.Row.extend({}), header : XABackgrid, - emptyText : 'No agent found!' + emptyText : 'No plugin found!' } })); },
