Repository: incubator-ranger Updated Branches: refs/heads/master 4b4790abe -> 6e07ed2c9
RANGER-1039 : User and groups having special characters are not populating in edit policy page 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/04378e38 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/04378e38 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/04378e38 Branch: refs/heads/master Commit: 04378e386793180c61d1167f168b6aad9620d179 Parents: 4b4790a Author: pradeep agrawal <[email protected]> Authored: Sat Jun 18 08:05:43 2016 +0530 Committer: Velmurugan Periasamy <[email protected]> Committed: Mon Jun 20 23:07:16 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/ranger/rest/XUserREST.java | 3 +-- .../scripts/views/policies/PermissionList.js | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/04378e38/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java b/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java index 1441ff5..226d3c7 100644 --- a/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java @@ -341,8 +341,7 @@ public class XUserREST { SearchCriteria searchCriteria = searchUtil.extractCommonCriterias( request, xUserService.sortFields); - searchUtil.extractString(request, searchCriteria, "name", "User name", - StringUtil.VALIDATION_TEXT); + searchUtil.extractString(request, searchCriteria, "name", "User name",null); searchUtil.extractString(request, searchCriteria, "emailAddress", "Email Address", null); searchUtil.extractInt(request, searchCriteria, "userSource", "User Source"); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/04378e38/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 44134af..44a6c80 100644 --- a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js +++ b/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js @@ -31,6 +31,7 @@ define(function(require) { var SessionMgr = require('mgrs/SessionMgr'); var VXGroup = require('models/VXGroup'); + var VXUser = require('models/VXUser'); var VXGroupList = require('collections/VXGroupList'); var VXUserList = require('collections/VXUserList'); @@ -182,18 +183,18 @@ define(function(require) { }); }, createDropDown :function($select, list, typeGroup){ - var that = this; - var placeholder = (typeGroup) ? 'Select Group' : 'Select User'; - var url = (typeGroup) ? "service/xusers/groups" : "service/xusers/users"; + var that = this, + placeholder = (typeGroup) ? 'Select Group' : 'Select User', + searchUrl = (typeGroup) ? "service/xusers/groups" : "service/xusers/users", + getUrl = (typeGroup) ? "service/xusers/groups/groupName/" : "service/xusers/users/userName/"; if(this.model.has('editMode') && !_.isEmpty($select.val())){ var temp = $select.val().split(","); _.each(temp , function(name){ if(_.isEmpty(list.where({ 'name' : name}))){ - var coll; - coll = typeGroup ? new VXGroupList() : new VXUserList(); - coll.queryParams['name'] = name; - coll.fetch({async:false}).done(function(){ - list.add(coll.models); + var model = typeGroup ? new VXGroup() : new VXUser(); + model.urlRoot = getUrl + name; + model.fetch({async:false}).done(function(){ + list.add(model); }); } }); @@ -218,7 +219,7 @@ define(function(require) { callback(data); }, ajax: { - url: url, + url: searchUrl, dataType: 'json', data: function (term, page) { return {name : term, isVisible : XAEnums.VisibilityStatus.STATUS_VISIBLE.value};
