Repository: incubator-ranger Updated Branches: refs/heads/master c1de019f4 -> a23e431a3
RANGER-393 : Fixed group listing and some other minor changes Signed-off-by: Velmurugan Periasamy <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/a23e431a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/a23e431a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/a23e431a Branch: refs/heads/master Commit: a23e431a3797f9f21dccb8b769cb578f50b6d5d5 Parents: c1de019 Author: Gautam Borad <[email protected]> Authored: Mon Apr 13 19:05:52 2015 +0530 Committer: Velmurugan Periasamy <[email protected]> Committed: Mon Apr 13 09:58:31 2015 -0400 ---------------------------------------------------------------------- .../ranger/service/RangerBaseModelService.java | 1 + .../main/webapp/scripts/controllers/Controller.js | 18 ++++++------------ .../main/webapp/scripts/modules/XAOverrides.js | 2 +- .../src/main/webapp/scripts/routers/Router.js | 3 ++- .../scripts/views/policies/PermissionList.js | 2 +- .../views/policies/RangerPolicyTableLayout.js | 2 +- .../main/webapp/scripts/views/users/UserForm.js | 2 +- .../webapp/scripts/views/users/UserTableLayout.js | 1 - 8 files changed, 13 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a23e431a/security-admin/src/main/java/org/apache/ranger/service/RangerBaseModelService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerBaseModelService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerBaseModelService.java index d1fc5ed..c134642 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/RangerBaseModelService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/RangerBaseModelService.java @@ -391,6 +391,7 @@ public abstract class RangerBaseModelService<T extends XXDBBase, V extends Range List<T> resultList = getDao().executeQueryInSecurityContext(tEntityClass, query); if (vList != null) { + vList.setResultSize(query.getResultList().size()); vList.setPageSize(query.getMaxResults()); vList.setSortBy(searchCriteria.getSortBy()); vList.setSortType(searchCriteria.getSortType()); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a23e431a/security-admin/src/main/webapp/scripts/controllers/Controller.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/controllers/Controller.js b/security-admin/src/main/webapp/scripts/controllers/Controller.js index e3a129e..a329dad 100644 --- a/security-admin/src/main/webapp/scripts/controllers/Controller.js +++ b/security-admin/src/main/webapp/scripts/controllers/Controller.js @@ -29,6 +29,7 @@ define(function(require) { return Backbone.Marionette.Controller.extend({ initialize: function( options ) { + console.log("initialize a Controller Controller"); var vTopNav = require('views/common/TopNav'); var vProfileBar = require('views/common/ProfileBar'); @@ -280,26 +281,19 @@ define(function(require) { var rangerService = new RangerService({id : serviceId}); var rangerPolicyList = new RangerPolicyList(); - /*var rangerPolicyList = new RangerPolicyList([],{ - queryParams : { - 'serviceId' : serviceId - } - });*/ rangerPolicyList.url = XAUtil.getServicePoliciesURL(serviceId); rangerService.fetch({ cache : false, async : false }); - rangerPolicyList.fetch({ cache : false, - }).done(function(){ - App.rContent.show(new view({ - collection : rangerPolicyList, - rangerService : rangerService - })); - }); + }); + App.rContent.show(new view({ + collection : rangerPolicyList, + rangerService : rangerService + })); }, RangerPolicyCreateAction :function(serviceId){ MAppState.set({ 'currentTab' : XAGlobals.AppTabs.PolicyManager.value }); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a23e431a/security-admin/src/main/webapp/scripts/modules/XAOverrides.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/modules/XAOverrides.js b/security-admin/src/main/webapp/scripts/modules/XAOverrides.js index 11085d5..2d36a98 100644 --- a/security-admin/src/main/webapp/scripts/modules/XAOverrides.js +++ b/security-admin/src/main/webapp/scripts/modules/XAOverrides.js @@ -418,7 +418,7 @@ //check dirtyField for input this.$resource.on('change', function(e) { if(_.isUndefined(that.resourceOpts.select2Opts)){ - that.checkDirtyFieldForSelect2($(e.currentTarget), that, this.value); +// that.checkDirtyFieldForSelect2($(e.currentTarget), that, this.value); } }); //create select2 if select2Opts is specified http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a23e431a/security-admin/src/main/webapp/scripts/routers/Router.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/routers/Router.js b/security-admin/src/main/webapp/scripts/routers/Router.js index 61377ee..70943a1 100644 --- a/security-admin/src/main/webapp/scripts/routers/Router.js +++ b/security-admin/src/main/webapp/scripts/routers/Router.js @@ -78,7 +78,8 @@ function(Backbone, Marionette, localization, MAppState, XAUtil){ var overrideCallback = function() { callbackArgs = arguments; - if (window._preventNavigation) { + var formStatus = $('.form-horizontal').find('.dirtyField').length > 0 ? true : false + if (window._preventNavigation && formStatus) { bootbox.dialog(window._preventNavigationMsg, [{ "label": "Stay on this page!", "class": "btn-success btn-small", http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a23e431a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js b/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js index 678d5d5..978d242 100644 --- a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js +++ b/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js @@ -223,7 +223,7 @@ define(function(require) { return result.text; }, formatNoMatches: function(result){ - return 'No group found.'; + return typeGroup ? 'No group found.' : 'No user found.'; } }).on('select2-focus', XAUtil.select2Focus); }, http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a23e431a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js index 298933d..98a253d 100644 --- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js +++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js @@ -320,7 +320,7 @@ define(function(require){ var searchOpt = ['Policy Name','Group Name','User Name','Status'];//,'Start Date','End Date','Today']; searchOpt = _.union(searchOpt, resourceSearchOpt) var serverAttrName = [{text : "Policy Name", label :"policyName"},{text : "Group Name", label :"group"}, - {text : "User Name", label :"user"}, {text : "Status", label :"status"}]; + {text : "User Name", label :"user"}, {text : "Status", label :"isEnabled"}]; // {text : 'Start Date',label :'startDate'},{text : 'End Date',label :'endDate'}, // {text : 'Today',label :'today'}]; var serverRsrcAttrName = _.map(resourceSearchOpt,function(opt){ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a23e431a/security-admin/src/main/webapp/scripts/views/users/UserForm.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/users/UserForm.js b/security-admin/src/main/webapp/scripts/views/users/UserForm.js index b4e5138..086fcb2 100644 --- a/security-admin/src/main/webapp/scripts/views/users/UserForm.js +++ b/security-admin/src/main/webapp/scripts/views/users/UserForm.js @@ -68,7 +68,7 @@ define(function(require){ }, password : { type : 'Password', - title : localization.tt("lbl.password") +' *', + title : localization.tt("lbl.newPassword") +' *', validators : ['required', {type: 'match', field: 'passwordConfirm', message: 'Passwords must match!'}, {type:'regexp',regexp:/^.*(?=.{8,256})(?=.*\d)(?=.*[a-zA-Z]).*$/,message :localization.tt('validationMessages.passwordError')}], editorAttrs : {'onpaste':'return false;','oncopy':'return false;','autocomplete':'off'} http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a23e431a/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js b/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js index 74ecdbe..87458d5 100644 --- a/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js +++ b/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js @@ -85,7 +85,6 @@ define(function(require){ this.showUsers = this.tab == 'usertab' ? true : false; this.chgFlags = []; - this.showUsers = true; if(_.isUndefined(this.groupList)){ this.groupList = new VXGroupList();
