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

permissions: add better helper block about default permissions, and corelation with anonymous access.

Browse source
This commit is contained in:
Bartlomiej Wolynczyk 2020-01-27 23:20:32 +01:00
parent e1a5fb601d
commit 3dc437b9b2
5 changed files with 32 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rhodecode/public/css/type.less
View file

@ -593,7 +593,7 @@ address {
}
.help-block-inline {
margin: 0;
margin: 0 !important;
}
// help block text

2
rhodecode/templates/admin/repo_groups/repo_group_edit.mako
View file

@ -28,7 +28,7 @@
<div class="sidebar">
<ul class="nav nav-pills nav-stacked">
<li class="${h.is_active('settings', c.active)}"><a href="${h.route_path('edit_repo_group', repo_group_name=c.repo_group.group_name)}">${_('Settings')}</a></li>
<li class="${h.is_active('permissions', c.active)}"><a href="${h.route_path('edit_repo_group_perms', repo_group_name=c.repo_group.group_name)}">${_('Permissions')}</a></li>
<li class="${h.is_active('permissions', c.active)}"><a href="${h.route_path('edit_repo_group_perms', repo_group_name=c.repo_group.group_name)}">${_('Access Permissions')}</a></li>
<li class="${h.is_active('advanced', c.active)}"><a href="${h.route_path('edit_repo_group_advanced', repo_group_name=c.repo_group.group_name)}">${_('Advanced')}</a></li>
<li class="${h.is_active('integrations', c.active)}"><a href="${h.route_path('repo_group_integrations_home', repo_group_name=c.repo_group.group_name)}">${_('Integrations')}</a></li>
</ul>

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

@ -61,7 +61,12 @@
${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
<span class="user">
% if _user.username == h.DEFAULT_USER:
${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
${h.DEFAULT_USER}
% if _user.active:
<span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span>
% else:
<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):
@ -104,7 +109,12 @@
${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
<span class="user">
% if _user.username == h.DEFAULT_USER:
${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
${h.DEFAULT_USER}
% if _user.active:
<span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span>
% else:
<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):

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

@ -87,7 +87,12 @@
${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
<span class="user">
% if _user.username == h.DEFAULT_USER:
${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
${h.DEFAULT_USER}
% if _user.active:
<span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span>
% else:
<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):

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

@ -63,7 +63,12 @@
${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
<span class="user">
% if _user.username == h.DEFAULT_USER:
${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
${h.DEFAULT_USER}
% if _user.active:
<span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span>
% else:
<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):
@ -106,7 +111,12 @@
${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
<span class="user">
% if _user.username == h.DEFAULT_USER:
${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
${h.DEFAULT_USER}
% if _user.active:
<span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span>
% else:
<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):