Merge lp:~cjohnston/loco-team-portal/mugshot into lp:loco-team-portal

Proposed by Chris Johnston
Status: Merged
Approved by: Adnane Belmadiaf
Approved revision: 466
Merged at revision: 467
Proposed branch: lp:~cjohnston/loco-team-portal/mugshot
Merge into: lp:loco-team-portal
Diff against target: 19 lines (+2/-0)
1 file modified
loco_directory/templates/events/team_event_detail_attendees.inc.html (+2/-0)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/mugshot
Reviewer Review Type Date Requested Status
Adnane Belmadiaf Approve
Review via email: mp+68966@code.launchpad.net

Commit message

Comments out the mugshot until they are able to be displayed properly.

To post a comment you must log in.
Revision history for this message
Adnane Belmadiaf (daker) wrote :

Look good, also this need to be fixed on LP.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/templates/events/team_event_detail_attendees.inc.html'
2--- loco_directory/templates/events/team_event_detail_attendees.inc.html 2011-04-07 13:10:41 +0000
3+++ loco_directory/templates/events/team_event_detail_attendees.inc.html 2011-07-23 19:01:38 +0000
4@@ -40,6 +40,7 @@
5 <tbody>
6 {% for registration in team_event_object.attendee_set.all %}
7 <tr class="team_event_list_row {% cycle "odd" "even" %}">
8+<!--- Commenting out until bug #734520 is fixed.
9 <td align="center" class="attendee-mugshot">
10 <a href="https://launchpad.net/~{{registration.attendee_profile.user.username}}" >
11 {% if registration.attendee_profile.mugshot %}
12@@ -47,6 +48,7 @@
13 {% endif %}
14 </a>
15 </td>
16+-->
17 <td align="center" class="attendee-cell">
18 <a href="https://launchpad.net/~{{registration.attendee_profile.user.username}}" >{{registration.attendee_profile.realname}}</a>
19 </td>

Subscribers

People subscribed via source and target branches