You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ve...@apache.org on 2016/09/07 19:13:17 UTC
[1/2] incubator-ranger git commit: RANGER-1166 : Auto complete wait
time needs to be increased on Ranger UI
Repository: incubator-ranger
Updated Branches:
refs/heads/master eea868860 -> 048f6a89d
RANGER-1166 : Auto complete wait time needs to be increased on Ranger UI
Signed-off-by: Velmurugan Periasamy <ve...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/3eba2a1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/3eba2a1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/3eba2a1e
Branch: refs/heads/master
Commit: 3eba2a1edadf7d1c706997401ba46cf13595e82a
Parents: eea8688
Author: Mehul Parikh <me...@freestoneinfotech.com>
Authored: Thu Sep 1 14:12:23 2016 +0530
Committer: Velmurugan Periasamy <ve...@apache.org>
Committed: Wed Sep 7 15:12:57 2016 -0400
----------------------------------------------------------------------
.../src/main/webapp/scripts/views/policies/RangerPolicyForm.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3eba2a1e/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
index b3f7ccd..aae9c70 100644
--- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
+++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
@@ -519,7 +519,7 @@ define(function(require){
setTimeout(function(){
p.abort();
console.log('connection timeout for resource path request...!!');
- }, 7000);
+ }, 10000);
},
open : function(){
$(this).removeClass('working');
@@ -620,7 +620,7 @@ define(function(require){
url: options.lookupURL,
type : 'POST',
params : {
- timeout: 3000,
+ timeout: 10000,
contentType: "application/json; charset=utf-8",
},
cache: false,
[2/2] incubator-ranger git commit: RANGER-1167 : Ranger admin UI
loading issues in Internet Explorer
Posted by ve...@apache.org.
RANGER-1167 : Ranger admin UI loading issues in Internet Explorer
Signed-off-by: Velmurugan Periasamy <ve...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/048f6a89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/048f6a89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/048f6a89
Branch: refs/heads/master
Commit: 048f6a89d05c39ce3c8363dbd542d98124cce69e
Parents: 3eba2a1
Author: Mehul Parikh <me...@freestoneinfotech.com>
Authored: Thu Sep 1 15:45:33 2016 +0530
Committer: Velmurugan Periasamy <ve...@apache.org>
Committed: Wed Sep 7 15:13:00 2016 -0400
----------------------------------------------------------------------
.../src/main/webapp/scripts/models/VXPortalUser.js | 2 +-
.../src/main/webapp/scripts/models/XABaseModel.js | 7 +++++--
.../views/reports/PlugableServiceDiffDetail.js | 16 +++++++++-------
.../scripts/views/reports/UserAccessLayout.js | 2 +-
4 files changed, 16 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/048f6a89/security-admin/src/main/webapp/scripts/models/VXPortalUser.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/models/VXPortalUser.js b/security-admin/src/main/webapp/scripts/models/VXPortalUser.js
index f2b7a10..b031974 100644
--- a/security-admin/src/main/webapp/scripts/models/VXPortalUser.js
+++ b/security-admin/src/main/webapp/scripts/models/VXPortalUser.js
@@ -23,7 +23,6 @@ define(function(require){
var VXPortalUserBase = require('model_bases/VXPortalUserBase');
var XAEnums = require('utils/XAEnums');
- var XAUtils = require('utils/XAUtils');
var localization = require('utils/XALangSupport');
var VXPortalUser = VXPortalUserBase.extend(
@@ -94,6 +93,7 @@ define(function(require){
userRoleList : {
type : 'Select',
options : function(callback, editor){
+ var XAUtils = require('utils/XAUtils');
var userTypes = _.filter(XAEnums.UserRoles,function(m){return m.label != 'Unknown'});
var nvPairs = XAUtils.enumToSelectPairs(userTypes);
callback(nvPairs);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/048f6a89/security-admin/src/main/webapp/scripts/models/XABaseModel.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/models/XABaseModel.js b/security-admin/src/main/webapp/scripts/models/XABaseModel.js
index 7d3a915..03b4e13 100644
--- a/security-admin/src/main/webapp/scripts/models/XABaseModel.js
+++ b/security-admin/src/main/webapp/scripts/models/XABaseModel.js
@@ -27,7 +27,6 @@ define(function(require){
'use strict';
var Backbone = require('backbone');
- var XAUtils = require('utils/XAUtils');
var XABaseModel = Backbone.Model.extend(
/** @lends XABaseModel.prototype */
@@ -41,7 +40,11 @@ define(function(require){
},
bindErrorEvents :function(){
- this.bind("error", XAUtils.defaultErrorHandler);
+ //Moved require inside fuctn expression due to ie issue
+ this.bind("error", function(){
+ var XAUtils = require('utils/XAUtils');
+ XAUtils.defaultErrorHandler();
+ });
},
/**
* toString for a model. Every model should implement this function.
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/048f6a89/security-admin/src/main/webapp/scripts/views/reports/PlugableServiceDiffDetail.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/reports/PlugableServiceDiffDetail.js b/security-admin/src/main/webapp/scripts/views/reports/PlugableServiceDiffDetail.js
index 7ff1b0e..0788a4e 100644
--- a/security-admin/src/main/webapp/scripts/views/reports/PlugableServiceDiffDetail.js
+++ b/security-admin/src/main/webapp/scripts/views/reports/PlugableServiceDiffDetail.js
@@ -112,13 +112,15 @@ define(function(require){
cache : false,
async : false
})
- this.rangerServiceDefModel = new RangerServiceDef();
- this.rangerServiceDefModel.url = XAUtils.getRangerServiceDef(rangerService.get('type'));
- this.rangerServiceDefModel.fetch({
- cache : false,
- async : false
- })
- this.repositoryType = this.rangerServiceDefModel.get('name');
+ if(!_.isUndefined(rangerService.get('type'))){
+ this.rangerServiceDefModel = new RangerServiceDef();
+ this.rangerServiceDefModel.url = XAUtils.getRangerServiceDef(rangerService.get('type'));
+ this.rangerServiceDefModel.fetch({
+ cache : false,
+ async : false
+ })
+ this.repositoryType = this.rangerServiceDefModel.get('name');
+ }
}
//get policy created/updated date/owner
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/048f6a89/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js b/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js
index 3535173..0e2401e 100644
--- a/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js
+++ b/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js
@@ -342,7 +342,7 @@ define(function(require) {'use strict';
},
policyType: {
label: 'Policy Type',
- cell: Backgrid.HtmlCell.extend({className: 'cellWidth-1', className: 'html-cell'}),
+ cell: Backgrid.HtmlCell.extend({className: 'html-cell, cellWidth-1'}),
formatter: _.extend({}, Backgrid.CellFormatter.prototype,{
fromRaw: function(rawValue,model){
var policyType = model.get("policyType");