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 2018/12/17 11:52:58 UTC
[19/28] ranger git commit: RANGER-2289: Unable to get Audit Admin tab
page
RANGER-2289: Unable to get Audit Admin tab page
Signed-off-by: peng.jianhua <pe...@zte.com.cn>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/6596dcda
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/6596dcda
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/6596dcda
Branch: refs/heads/ranger-1
Commit: 6596dcdae11dbf3ba7558aa91db7c77f0d48629b
Parents: dcfd789
Author: zhangqiang2 <zh...@zte.com.cn>
Authored: Tue Nov 20 17:43:07 2018 +0800
Committer: Mehul Parikh <me...@apache.org>
Committed: Thu Dec 13 17:44:29 2018 +0530
----------------------------------------------------------------------
.../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/6596dcda/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/6596dcda/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 fe9566c..56385bc 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')+'"'; });