LoCo Team Portal

Merge lp:~cjohnston/loco-team-portal/724759 into lp:loco-team-portal

  1. 724759
  2. Merge into 0.2
Proposed by Chris Johnston
Status: Merged
Approved by: Martin Owens
Approved revision: 498
Merged at revision: 502
Proposed branch: lp:~cjohnston/loco-team-portal/724759
Merge into: lp:loco-team-portal
Diff against target: 14 lines (+2/-2)
1 file modified
loco_directory/events/models.py (+2/-2)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/724759
Reviewer Review Type Date Requested Status
Martin Owens (community) Approve
Review via email: mp+80559@code.launchpad.net

Commit message

Defines that times for team events should be local times.

To post a comment you must log in.
Revision history for this message
Martin Owens (doctormo) wrote :

Reviewed and tested. Works and looks like a good change.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/events/models.py'
2--- loco_directory/events/models.py 2011-08-27 23:19:01 +0000
3+++ loco_directory/events/models.py 2011-10-27 13:01:24 +0000
4@@ -20,8 +20,8 @@
5 a simple basic event
6 """
7 name = models.CharField(max_length=150, verbose_name=_('Event Name'))
8- date_begin = models.DateTimeField(help_text=_('Local date and time that the event starts'), verbose_name=_('Begins'), db_index=True)
9- date_end = models.DateTimeField(help_text=_('Local date and time that the event ends'), verbose_name=_('Ends'), db_index=True)
10+ date_begin = models.DateTimeField(help_text=_('Local date and time that the event starts'), verbose_name=_('Local Start Time'), db_index=True)
11+ date_end = models.DateTimeField(help_text=_('Local date and time that the event ends'), verbose_name=_('Local End Time'), db_index=True)
12 description = models.TextField(help_text=_('Description of the Event'), blank=True, null=True)
13 announce = models.URLField(verbose_name=_('Announcement'), help_text=_('URL for the announcement'), max_length=200, verify_exists=False, blank=True, null=True)
14 date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now(), db_index=True)

Subscribers

People subscribed via source and target branches