##// END OF EJS Templates
permissions: fixed missing user info on global and repository permissions pages.
dan -
r4418:d143e1d9 default
parent child Browse files
Show More
@@ -960,7 +960,7 b' def link_to_user(author, length=0, **kwa'
960 if length:
960 if length:
961 display_person = shorter(display_person, length)
961 display_person = shorter(display_person, length)
962
962
963 if user:
963 if user and user.username != user.DEFAULT_USER:
964 return link_to(
964 return link_to(
965 escape(display_person),
965 escape(display_person),
966 route_path('user_profile', username=user.username),
966 route_path('user_profile', username=user.username),
@@ -243,7 +243,9 b''
243
243
244 <div class="${_class}">
244 <div class="${_class}">
245 ${self.gravatar(email, size, tooltip=tooltip, tooltip_alt=contact, user=rc_user)}
245 ${self.gravatar(email, size, tooltip=tooltip, tooltip_alt=contact, user=rc_user)}
246 <span class="${('user user-disabled' if show_disabled else 'user')}"> ${h.link_to_user(rc_user or contact)}</span>
246 <span class="${('user user-disabled' if show_disabled else 'user')}">
247 ${h.link_to_user(rc_user or contact)}
248 </span>
247 </div>
249 </div>
248 </%def>
250 </%def>
249
251
@@ -3,6 +3,7 b''
3 ## <%namespace name="dpb" file="/base/default_perms_box.mako"/>
3 ## <%namespace name="dpb" file="/base/default_perms_box.mako"/>
4 ## ${dpb.default_perms_box(<url_to_form>)}
4 ## ${dpb.default_perms_box(<url_to_form>)}
5 ## ${dpb.default_perms_radios()}
5 ## ${dpb.default_perms_radios()}
6 <%namespace name="base" file="/base/base.mako"/>
6
7
7 <%def name="default_perms_radios(global_permissions_template = False, suffix='', **kwargs)">
8 <%def name="default_perms_radios(global_permissions_template = False, suffix='', **kwargs)">
8 <div class="main-content-full-width">
9 <div class="main-content-full-width">
@@ -11,10 +12,22 b''
11 ## displayed according to checkbox selection
12 ## displayed according to checkbox selection
12 <div class="panel-heading">
13 <div class="panel-heading">
13 %if not global_permissions_template:
14 %if not global_permissions_template:
14 <h3 class="inherit_overlay_default panel-title">${_('Inherited Permissions')}</h3>
15 <h3 class="inherit_overlay_default panel-title">
15 <h3 class="inherit_overlay panel-title">${_('Custom Permissions')}</h3>
16 % if hasattr(c, 'user'):
17 ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')} &nbsp;-
18 % endif
19 ${_('Inherited Permissions')}
20 </h3>
21 <h3 class="inherit_overlay panel-title">
22 % if hasattr(c, 'user'):
23 ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')} &nbsp;-
24 % endif
25 ${_('Custom Permissions')}
26 </h3>
16 %else:
27 %else:
17 <h3 class="panel-title">${_('Default Global Permissions')}</h3>
28 <h3 class="panel-title">
29 ${_('Default Global Permissions')}
30 </h3>
18 %endif
31 %endif
19 </div>
32 </div>
20
33
@@ -2,14 +2,15 b''
2 ## usage:
2 ## usage:
3 ## <%namespace name="p" file="/base/perms_summary.mako"/>
3 ## <%namespace name="p" file="/base/perms_summary.mako"/>
4 ## ${p.perms_summary(c.perm_user.permissions)}
4 ## ${p.perms_summary(c.perm_user.permissions)}
5 <%namespace name="base" file="/base/base.mako"/>
5
6
6 <%def name="perms_summary(permissions, show_all=False, actions=True, side_link=None)">
7 <%def name="perms_summary(permissions, show_all=False, actions=True, side_link=None)">
7 <% section_to_label = {
8 <% section_to_label = {
8 'global': 'Global Permissions',
9 'global': 'Global Permissions Summary',
9 'repository_branches': 'Repository Branch Rules',
10 'repository_branches': 'Repository Branch Rules Summary',
10 'repositories': 'Repository Access Permissions',
11 'repositories': 'Repository Access Permissions Summary',
11 'user_groups': 'User Group Permissions',
12 'user_groups': 'User Group Permissions Summary',
12 'repositories_groups': 'Repository Group Permissions',
13 'repositories_groups': 'Repository Group Permissions Summary',
13 } %>
14 } %>
14
15
15 <div id="perms" class="table fields">
16 <div id="perms" class="table fields">
@@ -18,7 +19,11 b''
18
19
19 <div class="panel panel-default">
20 <div class="panel panel-default">
20 <div class="panel-heading" id="${section.replace("_","-")}-permissions">
21 <div class="panel-heading" id="${section.replace("_","-")}-permissions">
21 <h3 class="panel-title">${section_to_label.get(section, section)} - <span id="total_count_${section}"></span>
22 <h3 class="panel-title">
23 % if hasattr(c, 'user'):
24 ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')} &nbsp;-
25 % endif
26 ${section_to_label.get(section, section)} - <span id="total_count_${section}"></span>
22 <a class="permalink" href="#${section.replace("_","-")}-permissions"></a>
27 <a class="permalink" href="#${section.replace("_","-")}-permissions"></a>
23 </h3>
28 </h3>
24 % if side_link:
29 % if side_link:
General Comments 0
You need to be logged in to leave comments. Login now