Repository: ranger Updated Branches: refs/heads/master fed0498de -> 1cfa50f1e
RANGER-2289: Unable to get Audit Admin tab page Signed-off-by: peng.jianhua <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/1cfa50f1 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/1cfa50f1 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/1cfa50f1 Branch: refs/heads/master Commit: 1cfa50f1e8627ef1c61b6da8c031e4f2b18420e5 Parents: fed0498 Author: zhangqiang2 <[email protected]> Authored: Tue Nov 20 17:43:07 2018 +0800 Committer: peng.jianhua <[email protected]> Committed: Thu Nov 22 16:53:24 2018 +0800 ---------------------------------------------------------------------- .../src/main/webapp/scripts/utils/XAUtils.js | 17 ++++++++--------- .../webapp/scripts/views/reports/AuditLayout.js | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/1cfa50f1/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 bb88ec3..d85dc7a 100644 --- a/security-admin/src/main/webapp/scripts/utils/XAUtils.js +++ b/security-admin/src/main/webapp/scripts/utils/XAUtils.js @@ -770,15 +770,14 @@ define(function(require) { text : m.attributes.category }); var extraParam = {}; - if (_.has(serverParamName, 'multiple') - && serverParamName.multiple) { - extraParam[serverParamName.label] = XAUtils - .enumLabelToValue(serverParamName.optionsArr, m - .get('value')); - ; - $.extend(params, extraParam); - } else { - if (!_.isUndefined(serverParamName)) { + if (!_.isUndefined(serverParamName)) { + if (_.has(serverParamName, 'multiple') + && serverParamName.multiple) { + extraParam[serverParamName.label] = XAUtils + .enumLabelToValue(serverParamName.optionsArr, m + .get('value')); + $.extend(params, extraParam); + } else { extraParam[serverParamName.label] = m.get('value'); $.extend(params, extraParam); } http://git-wip-us.apache.org/repos/asf/ranger/blob/1cfa50f1/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 718a95d..9040c49 100644 --- a/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js +++ b/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js @@ -443,8 +443,8 @@ define(function(require) { }) if(!_.isUndefined(App.sessionId)){ App.vsHistory.admin = [] ; - query = '"Session Id": "'+App.sessionId+'"'; - App.vsHistory.admin.push(new Backbone.Model({'category':'Session Id', value:App.sessionId})); + query = '"Session ID": "'+App.sessionId+'"'; + App.vsHistory.admin.push(new Backbone.Model({'category':'Session ID', value:App.sessionId})); delete App.sessionId; }else{ _.map(App.vsHistory.admin, function(a){ query += '"'+a.get('category')+'":"'+a.get('value')+'"'; });
