ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From v..@apache.org
Subject [2/2] incubator-ranger git commit: RANGER-1167 : Ranger admin UI loading issues in Internet Explorer
Date Wed, 07 Sep 2016 19:15:11 GMT
RANGER-1167 : Ranger admin UI loading issues in Internet Explorer

Signed-off-by: Velmurugan Periasamy <vel@apache.org>
(cherry picked from commit 048f6a89d05c39ce3c8363dbd542d98124cce69e)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/351f870d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/351f870d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/351f870d

Branch: refs/heads/ranger-0.6
Commit: 351f870dfad48f72d19e722fdfb098dcea30e503
Parents: 064c4f8
Author: Mehul Parikh <mehul.parikh@freestoneinfotech.com>
Authored: Thu Sep 1 15:45:33 2016 +0530
Committer: Velmurugan Periasamy <vel@apache.org>
Committed: Wed Sep 7 15:14:52 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/351f870d/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/351f870d/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/351f870d/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/351f870d/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");


Mime
View raw message