LoCo Team Portal

Merge lp:~cjohnston/loco-team-portal/meeting-details into lp:loco-team-portal

  1. meeting-details
  2. Merge into 0.2
Proposed by Chris Johnston
Status: Merged
Merged at revision: 342
Proposed branch: lp:~cjohnston/loco-team-portal/meeting-details
Merge into: lp:loco-team-portal
Diff against target: 41 lines (+5/-3)
3 files modified
loco_directory/meetings/models.py (+1/-1)
loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html (+3/-1)
loco_directory/templates/meetings/team_meeting_detail_basic.inc.html (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/meeting-details
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+43239@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/meetings/models.py'
2--- loco_directory/meetings/models.py 2010-12-07 21:33:54 +0000
3+++ loco_directory/meetings/models.py 2010-12-09 16:43:10 +0000
4@@ -16,7 +16,7 @@
5 channel = models.CharField(max_length=150, verbose_name=_('Meeting Channel'), help_text=_('Channel that the meeting will be held in. Include #'), null=True)
6 logs = models.URLField(verbose_name=_('Meeting Log'), help_text=_('After the meeting, add a link to the meeting log'), max_length=200, verify_exists=False, blank=True, null=True)
7 date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now(), db_index=True)
8- chair = models.ForeignKey(UserProfile, blank=True, null=True)
9+ chair = models.ForeignKey(UserProfile, verbose_name=_('Meeting Chair'), blank=True, null=True)
10
11 def __unicode__(self):
12 return self.name
13
14=== modified file 'loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html'
15--- loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html 2010-12-07 21:33:54 +0000
16+++ loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html 2010-12-09 16:43:10 +0000
17@@ -1,8 +1,10 @@
18 {% load i18n %}
19-{% if team_meeting_object %}
20+{% if team_meeting_object.AgendaItem %}
21 <ol class="agenda-list">
22 {% for item in team_meeting_object.agenda.as_tree %}
23 {{item.as_ol|safe}}
24 {% endfor %}
25 </ol>
26+{% else %}
27+<p>{% trans "There are currently no items on the agenda." %}</p>
28 {% endif %}
29
30=== modified file 'loco_directory/templates/meetings/team_meeting_detail_basic.inc.html'
31--- loco_directory/templates/meetings/team_meeting_detail_basic.inc.html 2010-12-06 01:37:43 +0000
32+++ loco_directory/templates/meetings/team_meeting_detail_basic.inc.html 2010-12-09 16:43:10 +0000
33@@ -5,7 +5,7 @@
34 <tr>
35 <th class="form-item-label" scope="row"><label>{% trans "When:" %}</label></th>
36 <td class="form-item-value">
37- {% ifequal team_meeting_object.local_date_begin|date team_meeting_object.local_date_end|date %}
38+ {% ifequal team_meeting_object.date_begin|date team_meeting_object.date_end|date %}
39 {{ team_meeting_object.date_begin|date:"D, d N Y H:i" }} - {{ team_meeting_object.date_end|date:"H:i T (O)" }}
40 {% else %}
41 {{ team_meeting_object.date_begin|date:"D, d N Y H:i" }} - {{ team_meeting_object.date_end|date:"D, d N Y H:i T (O)" }}

Subscribers

People subscribed via source and target branches