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/19 11:51:18 UTC
[ranger] 28/39: RANGER-2289: Unable to get Audit Admin tab page
This is an automated email from the ASF dual-hosted git repository.
mehul pushed a commit to branch ranger-1.1
in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 1f8e788ad626c9739bad2ef8b416dafce6f2088b
Author: zhangqiang2 <zh...@zte.com.cn>
AuthorDate: Tue Nov 20 17:43:07 2018 +0800
RANGER-2289: Unable to get Audit Admin tab page
Signed-off-by: peng.jianhua <pe...@zte.com.cn>
---
security-admin/src/main/webapp/scripts/utils/XAUtils.js | 17 ++++++++---------
.../main/webapp/scripts/views/reports/AuditLayout.js | 4 ++--
2 files changed, 10 insertions(+), 11 deletions(-)
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);
}
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')+'"'; });