Repository: incubator-ranger Updated Branches: refs/heads/master 96d7fb48e -> 7fc7c9f27
RANGER-193 : Allow user to be created without group association Signed-off-by: sneethiraj <[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/7fc7c9f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/7fc7c9f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/7fc7c9f2 Branch: refs/heads/master Commit: 7fc7c9f27f931c3c260f66cc967c7d1ae983954c Parents: 96d7fb4 Author: Gautam Borad <[email protected]> Authored: Mon Dec 8 11:34:48 2014 +0530 Committer: sneethiraj <[email protected]> Committed: Mon Dec 8 07:46:55 2014 -0500 ---------------------------------------------------------------------- security-admin/src/main/webapp/scripts/views/users/UserForm.js | 4 ++-- .../src/main/webapp/templates/common/AddGroup_tmpl.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/7fc7c9f2/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 e9126d8..eca7834 100644 --- a/security-admin/src/main/webapp/scripts/views/users/UserForm.js +++ b/security-admin/src/main/webapp/scripts/views/users/UserForm.js @@ -209,14 +209,14 @@ define(function(require){ var groupArr = this.$('[data-customfields="groupIdList"]').find('.tags').editable('getValue', true); if(_.isNumber(groupArr)) groupArr = groupArr.toString().split(','); - if(_.isEmpty(groupArr) ){ + /*if(_.isEmpty(groupArr) ){ this.$('[data-customfields="groupIdList"]').find('.control-group').addClass('error'); this.$('[data-customfields="groupIdList"]').find('[data-error="groupIdList"]').show(); return false; }else{ this.$('[data-customfields="groupIdList"]').find('.control-group').removeClass('error'); this.$('[data-customfields="groupIdList"]').find('[data-error="groupIdList"]').hide(); - } + }*/ this.model.set('groupIdList',groupArr); this.model.set('status',XAEnums.ActivationStatus.ACT_STATUS_ACTIVE.value); this.model.unset('passwordConfirm'); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/7fc7c9f2/security-admin/src/main/webapp/templates/common/AddGroup_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/common/AddGroup_tmpl.html b/security-admin/src/main/webapp/templates/common/AddGroup_tmpl.html index 698d502..af966e7 100644 --- a/security-admin/src/main/webapp/templates/common/AddGroup_tmpl.html +++ b/security-admin/src/main/webapp/templates/common/AddGroup_tmpl.html @@ -15,7 +15,7 @@ limitations under the License. --}} <div class="control-group field-groupIdList"> - <label class="control-label" for="c13_group">Group *</label> + <label class="control-label" for="c13_group">Group </label> <div class="controls controls-row"> <div class="tags" id="tags-editable-1" data-toggle="manual" data-type="select2" data-value="{{groupId}}" data-original-title="Enter Group Name">
