diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -960,7 +960,7 @@ def link_to_user(author, length=0, **kwa if length: display_person = shorter(display_person, length) - if user: + if user and user.username != user.DEFAULT_USER: return link_to( escape(display_person), route_path('user_profile', username=user.username), diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako --- a/rhodecode/templates/base/base.mako +++ b/rhodecode/templates/base/base.mako @@ -243,7 +243,9 @@
${self.gravatar(email, size, tooltip=tooltip, tooltip_alt=contact, user=rc_user)} - ${h.link_to_user(rc_user or contact)} + + ${h.link_to_user(rc_user or contact)} +
diff --git a/rhodecode/templates/base/default_perms_box.mako b/rhodecode/templates/base/default_perms_box.mako --- a/rhodecode/templates/base/default_perms_box.mako +++ b/rhodecode/templates/base/default_perms_box.mako @@ -3,6 +3,7 @@ ## <%namespace name="dpb" file="/base/default_perms_box.mako"/> ## ${dpb.default_perms_box()} ## ${dpb.default_perms_radios()} +<%namespace name="base" file="/base/base.mako"/> <%def name="default_perms_radios(global_permissions_template = False, suffix='', **kwargs)">
@@ -11,10 +12,22 @@ ## displayed according to checkbox selection
%if not global_permissions_template: -

${_('Inherited Permissions')}

-

${_('Custom Permissions')}

+

+ % if hasattr(c, 'user'): + ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}  - + % endif + ${_('Inherited Permissions')} +

+

+ % if hasattr(c, 'user'): + ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}  - + % endif + ${_('Custom Permissions')} +

%else: -

${_('Default Global Permissions')}

+

+ ${_('Default Global Permissions')} +

%endif
diff --git a/rhodecode/templates/base/perms_summary.mako b/rhodecode/templates/base/perms_summary.mako --- a/rhodecode/templates/base/perms_summary.mako +++ b/rhodecode/templates/base/perms_summary.mako @@ -2,14 +2,15 @@ ## usage: ## <%namespace name="p" file="/base/perms_summary.mako"/> ## ${p.perms_summary(c.perm_user.permissions)} +<%namespace name="base" file="/base/base.mako"/> <%def name="perms_summary(permissions, show_all=False, actions=True, side_link=None)"> <% section_to_label = { - 'global': 'Global Permissions', - 'repository_branches': 'Repository Branch Rules', - 'repositories': 'Repository Access Permissions', - 'user_groups': 'User Group Permissions', - 'repositories_groups': 'Repository Group Permissions', + 'global': 'Global Permissions Summary', + 'repository_branches': 'Repository Branch Rules Summary', + 'repositories': 'Repository Access Permissions Summary', + 'user_groups': 'User Group Permissions Summary', + 'repositories_groups': 'Repository Group Permissions Summary', } %>
@@ -18,7 +19,11 @@
-

${section_to_label.get(section, section)} - +

+ % if hasattr(c, 'user'): + ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}  - + % endif + ${section_to_label.get(section, section)} -

% if side_link: