Merge lp:~ronnie.vd.c/loco-team-portal/707572-link-add-agenda into lp:loco-team-portal

Proposed by Ronnie
Status: Merged
Approved by: Michael Hall
Approved revision: 378
Merged at revision: 380
Proposed branch: lp:~ronnie.vd.c/loco-team-portal/707572-link-add-agenda
Merge into: lp:loco-team-portal
Diff against target: 14 lines (+2/-0)
1 file modified
loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html (+2/-0)
To merge this branch: bzr merge lp:~ronnie.vd.c/loco-team-portal/707572-link-add-agenda
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+47468@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html'
2--- loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html 2011-01-23 15:20:31 +0000
3+++ loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html 2011-01-25 22:14:14 +0000
4@@ -1,8 +1,10 @@
5 {% load i18n %}
6 {% load recurse %}
7+{% if is_member %}
8 <p>
9 <a href="{% url agenda-item-new team_meeting_object.id %}">{% trans 'Add Agenda Item' %}</a>
10 </p>
11+{% endif %}
12 {% if team_meeting_object.agenda %}
13 {% recurse item.children.all with team_meeting_object.agenda.top as item %}
14 <ol class="agenda-list">

Subscribers

People subscribed via source and target branches