engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

permissions: explain better what is inactive duplicate in permissions, sort them to last positions, and make them less visible.

Browse source
This commit is contained in:
Daniel Dourvaris 2020-07-01 12:44:50 +02:00
parent 93f6f169ac
commit 0c823eb312
5 changed files with 58 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rhodecode/model/db.py
View file

@ -103,7 +103,12 @@ def display_user_sort(obj):
if obj.username == User.DEFAULT_USER:
return '#####'
prefix = PERMISSION_TYPE_SORT.get(obj.permission.split('.')[-1], '')
return prefix + obj.username
extra_sort_num = '1' # default
# NOTE(dan): inactive duplicates goes last
if getattr(obj, 'duplicate_perm', None):
extra_sort_num = '9'
return prefix + extra_sort_num + obj.username
def display_user_group_sort(obj):

6
rhodecode/public/css/tables.less
View file

@ -33,6 +33,12 @@ table.dataTable {
.rc-user {
white-space: nowrap;
}
.user-perm-duplicate {
color: @grey4;
a {
color: @grey4;
}
}
}
.td-email {

26
rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako
View file

@ -68,10 +68,15 @@
<span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span>
% endif
% else:
${h.link_to_user(_user.username)}
%if getattr(_user, 'duplicate_perm', None):
(${_('inactive duplicate')})
%endif
% if getattr(_user, 'duplicate_perm', None):
<span class="user-perm-duplicate">
${h.link_to_user(_user.username)}
<span class="tooltip" title="${_('This entry is a duplicate, most probably left-over from previously set permission. This user has a higher permission set, so this entry is inactive. Please revoke this permission manually.')}">(${_('inactive duplicate')})
</span>
</span>
% else:
${h.link_to_user(_user.username)}
% endif
% endif
</span>
</td>
@ -116,10 +121,15 @@
<span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span>
% endif
% else:
${h.link_to_user(_user.username)}
%if getattr(_user, 'duplicate_perm', None):
(${_('inactive duplicate')})
%endif
% if getattr(_user, 'duplicate_perm', None):
<span class="user-perm-duplicate">
${h.link_to_user(_user.username)}
<span class="tooltip" title="${_('This entry is a duplicate, most probably left-over from previously set permission. This user has a higher permission set, so this entry is inactive. Please revoke this permission manually.')}">(${_('inactive duplicate')})
</span>
</span>
% else:
${h.link_to_user(_user.username)}
% endif
% endif
<span class="user-perm-help-text">(${_('delegated admin')})</span>
</span>

14
rhodecode/templates/admin/repos/repo_edit_permissions.mako
View file

@ -94,10 +94,16 @@
<span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span>
% endif
% else:
${h.link_to_user(_user.username)}
%if getattr(_user, 'duplicate_perm', None):
(${_('inactive duplicate')})
%endif
% if getattr(_user, 'duplicate_perm', None):
<span class="user-perm-duplicate">
${h.link_to_user(_user.username)}
<span class="tooltip" title="${_('This entry is a duplicate, most probably left-over from previously set permission. This user has a higher permission set, so this entry is inactive. Please revoke this permission manually.')}">(${_('inactive duplicate')})
</span>
</span>
% else:
${h.link_to_user(_user.username)}
% endif
%if getattr(_user, 'branch_rules', None):
% if used_by_n_rules == 1:
(${_('used by {} branch rule, requires write+ permissions').format(used_by_n_rules)})

26
rhodecode/templates/admin/user_groups/user_group_edit_perms.mako
View file

@ -74,10 +74,15 @@
<span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span>
% endif
% else:
${h.link_to_user(_user.username)}
%if getattr(_user, 'duplicate_perm', None):
(${_('inactive duplicate')})
%endif
% if getattr(_user, 'duplicate_perm', None):
<span class="user-perm-duplicate">
${h.link_to_user(_user.username)}
<span class="tooltip" title="${_('This entry is a duplicate, most probably left-over from previously set permission. This user has a higher permission set, so this entry is inactive. Please revoke this permission manually.')}">(${_('inactive duplicate')})
</span>
</span>
% else:
${h.link_to_user(_user.username)}
% endif
% endif
</span>
</td>
@ -122,10 +127,15 @@
<span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span>
% endif
% else:
${h.link_to_user(_user.username)}
%if getattr(_user, 'duplicate_perm', None):
(${_('inactive duplicate')})
%endif
% if getattr(_user, 'duplicate_perm', None):
<span class="user-perm-duplicate">
${h.link_to_user(_user.username)}
<span class="tooltip" title="${_('This entry is a duplicate, most probably left-over from previously set permission. This user has a higher permission set, so this entry is inactive. Please revoke this permission manually.')}">(${_('inactive duplicate')})
</span>
</span>
% else:
${h.link_to_user(_user.username)}
% endif
% endif
<span class="user-perm-help-text">(${_('delegated admin')})</span>
</span>