diff --git a/rhodecode/controllers/admin/users_groups.py b/rhodecode/controllers/admin/users_groups.py --- a/rhodecode/controllers/admin/users_groups.py +++ b/rhodecode/controllers/admin/users_groups.py @@ -108,8 +108,9 @@ class UsersGroupsController(BaseControll # url('users_group', id=ID) c.users_group = UsersGroup.get(id) - c.group_members = [(x.user_id, x.user.username) for x in - c.users_group.members] + c.group_members_obj = [x.user for x in c.users_group.members] + c.group_members = [(x.user_id, x.username) for x in + c.group_members_obj] c.available_members = [(x.user_id, x.username) for x in self.sa.query(User).all()] @@ -181,8 +182,9 @@ class UsersGroupsController(BaseControll return redirect(url('users_groups')) c.users_group.permissions = {} - c.group_members = [(x.user_id, x.user.username) for x in - c.users_group.members] + c.group_members_obj = [x.user for x in c.users_group.members] + c.group_members = [(x.user_id, x.username) for x in + c.group_members_obj] c.available_members = [(x.user_id, x.username) for x in self.sa.query(User).all()] defaults = c.users_group.get_dict() diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -3639,6 +3639,16 @@ div#legend_container table td,div#legend padding-left: 3px; } + +.group_members_wrap{ + +} + +.group_members .group_member{ + height: 30px; + padding:0px 0px 0px 10px; +} + /*README STYLE*/ div.readme { diff --git a/rhodecode/templates/admin/users_groups/users_group_edit.html b/rhodecode/templates/admin/users_groups/users_group_edit.html --- a/rhodecode/templates/admin/users_groups/users_group_edit.html +++ b/rhodecode/templates/admin/users_groups/users_group_edit.html @@ -94,6 +94,51 @@ ${h.end_form()} +
+ +
+
${_('Permissions')}
+
+ ${h.form(url('users_group_perm', id=c.users_group.users_group_id), method='put')} +
+ +
+
+
+ +
+
+ ${h.checkbox('create_repo_perm',value=True)} +
+
+
+ ${h.submit('save',_('Save'),class_="ui-button")} + ${h.reset('reset',_('Reset'),class_="ui-button")} +
+
+
+ ${h.end_form()} +
+ +
+ +
+
${_('Group members')}
+
+
+ +
+
-
- -
-
${_('Permissions')}
-
- ${h.form(url('users_group_perm', id=c.users_group.users_group_id), method='put')} -
- -
-
-
- -
-
- ${h.checkbox('create_repo_perm',value=True)} -
-
-
- ${h.submit('save',_('Save'),class_="ui-button")} - ${h.reset('reset',_('Reset'),class_="ui-button")} -
-
-
- ${h.end_form()} -