Merge lp:~cjohnston/loco-team-portal/bugfix-lp-582028 into lp:loco-team-portal

Proposed by Chris Johnston
Status: Merged
Merged at revision: 135
Proposed branch: lp:~cjohnston/loco-team-portal/bugfix-lp-582028
Merge into: lp:loco-team-portal
Diff against target: 12 lines (+1/-1)
1 file modified
loco_directory/templates/events/team_event_list.inc.html (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/bugfix-lp-582028
Reviewer Review Type Date Requested Status
Efrain Valles Approve
Michael Hall (community) Approve
Review via email: mp+25559@code.launchpad.net

Description of the change

Changes LP short name to display name on events page

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

Looks good to me.

review: Approve
Revision history for this message
Efrain Valles (effie-jayx) wrote :

Looks good to me too.

Revision history for this message
Efrain Valles (effie-jayx) wrote :

> Looks good to me too.

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_list.inc.html'
2--- loco_directory/templates/events/team_event_list.inc.html 2010-04-26 16:43:25 +0000
3+++ loco_directory/templates/events/team_event_list.inc.html 2010-05-18 19:51:24 +0000
4@@ -13,7 +13,7 @@
5 <td class="event_begin">{{team_event.date_begin|date}} {{ team_event.date_begin|date:"H:i T"}}</td>
6 <td class="event_end">{{team_event.date_end|date}} {{ team_event.date_end|date:"H:i T"}}</td>
7 <td class="event_global">{% if team_event.global_event %}<a href="{{ team_event.global_event.get_absolute_url }}">{{ team_event.global_event.name}}</a>{% else %}--{% endif %}</td>
8-<td class="event_teams">{% for team in team_event.teams.all %}<a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{team.lp_name}}</a>{% if not forloop.last %}<br/>{% endif %}{% endfor %}</td>
9+<td class="event_teams">{% for team in team_event.teams.all %}<a title="{% trans "more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% if not forloop.last %}<br/>{% endif %}{% endfor %}</td>
10 </tr>
11 {% endfor %}
12 </table>

Subscribers

People subscribed via source and target branches