Merge lp:~daker/loco-team-portal/fix.656191 into lp:loco-team-portal

Proposed by Adnane Belmadiaf
Status: Merged
Merged at revision: 308
Proposed branch: lp:~daker/loco-team-portal/fix.656191
Merge into: lp:loco-team-portal
Diff against target: 25 lines (+2/-2)
2 files modified
loco_directory/templates/events/global_event_detail.inc.html (+1/-1)
loco_directory/templates/events/team_event_detail.inc.html (+1/-1)
To merge this branch: bzr merge lp:~daker/loco-team-portal/fix.656191
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+37907@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

well done!

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/global_event_detail.inc.html'
2--- loco_directory/templates/events/global_event_detail.inc.html 2010-09-09 21:07:01 +0000
3+++ loco_directory/templates/events/global_event_detail.inc.html 2010-10-07 21:04:40 +0000
4@@ -91,7 +91,7 @@
5 {% if global_event_object.description %}
6 <table id="global-event-basic">
7 <tr>
8- <td class="form-item-value">{{ global_event_object.description|linebreaksbr }}</td>
9+ <td class="form-item-value">{{ global_event_object.description|linebreaksbr|urlize }}</td>
10 </tr>
11 </table>
12 {% endif %}
13
14=== modified file 'loco_directory/templates/events/team_event_detail.inc.html'
15--- loco_directory/templates/events/team_event_detail.inc.html 2010-08-16 18:14:57 +0000
16+++ loco_directory/templates/events/team_event_detail.inc.html 2010-10-07 21:04:40 +0000
17@@ -4,7 +4,7 @@
18 {% if team_event_object.description %}
19 <table id="team-event-basic">
20 <tr>
21- <td class="form-item-value">{{ team_event_object.description|linebreaksbr }}</td>
22+ <td class="form-item-value">{{ team_event_object.description|linebreaksbr|urlize }}</td>
23 </tr>
24 </table>
25 {% endif %}

Subscribers

People subscribed via source and target branches