Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/686271
into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#686271 Allow users to add meeting minutes after the meeting
https://bugs.launchpad.net/bugs/686271
For more details, see:
https://code.launchpad.net/~chrisjohnston/loco-directory/686271/+merge/44661
--
https://code.launchpad.net/~chrisjohnston/loco-directory/686271/+merge/44661
Your team loco-directory-dev is requested to review the proposed merge of
lp:~chrisjohnston/loco-directory/686271 into lp:loco-directory.
=== modified file 'loco_directory/meetings/models.py'
--- loco_directory/meetings/models.py 2010-12-09 16:31:57 +0000
+++ loco_directory/meetings/models.py 2010-12-24 13:21:15 +0000
@@ -15,6 +15,7 @@
date_end = models.DateTimeField(help_text=_('end date and local time of the meeting in UTC'), verbose_name=_('Ends'), db_index=True)
channel = models.CharField(max_length=150, verbose_name=_('Meeting Channel'), help_text=_('Channel that the meeting will be held in. Include #'), null=True)
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)
+ minutes = models.URLField(verbose_name=_('Meeting Minutes'), help_text=_('After the meeting, add a link to the meeting minutes'), max_length=200, verify_exists=False, blank=True, null=True)
date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now(), db_index=True)
chair = models.ForeignKey(UserProfile, verbose_name=_('Meeting Chair'), blank=True, null=True)
=== modified file 'loco_directory/templates/meetings/team_meeting_detail_basic.inc.html'
--- loco_directory/templates/meetings/team_meeting_detail_basic.inc.html 2010-12-16 13:05:09 +0000
+++ loco_directory/templates/meetings/team_meeting_detail_basic.inc.html 2010-12-24 13:21:15 +0000
@@ -19,13 +19,32 @@
<th class="form-item-label" scope="row"><label>{% trans "Organizing Team:" %}</label></th>
<td class="form-item-value">{% for team in team_meeting_object.teams.all %}<a title="{% trans "Get more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% if not forloop.last %},{% endif %}{% endfor %}</td>
</tr>
-{% endif %}
-
-{% if team_meeting_object.teams.all %}
+ <tr>
+ <th class="form-item-label" scope="row"><label>{% trans "Meeting Channel:" %}</label></th>
+ <td class="form-item-value">{{ team_meeting_object.channel }}</td>
+ </tr>
<tr>
<th class="form-item-label" scope="row"><label>{% trans "Meeting Chair:" %}</label></th>
- <td class="form-item-value">{{ team_meeting_object.chair }}</td>
+ <td class="form-item-value">
+ {% if team_meeting_object.chair %}
+ {{ team_meeting_object.chair }}
+ {% else %}
+ {% trans "No Meeting Chair Assigned" %}
+ {% endif %}
+ </td>
</tr>
+ {% if team_meeting_object.minutes %}
+ <tr>
+ <th class="form-item-label" scope="row"><label>{% trans "Meeting Minutes:" %}</label></th>
+ <td class="form-item-value">{{ team_meeting_object.minutes }}</td>
+ </tr>
+ {% endif %}
+ {% if team_meeting_object.logs %}
+ <tr>
+ <th class="form-item-label" scope="row"><label>{% trans "Meeting Logs:" %}</label></th>
+ <td class="form-item-value">{{ team_meeting_object.logs }}</td>
+ </tr>
+ {% endif %}
{% endif %}
</table>
{% endif %}
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
