Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/696661
into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#696661 Expires Date / Date Expires does not make sense
https://bugs.launchpad.net/bugs/696661
For more details, see:
https://code.launchpad.net/~chrisjohnston/loco-directory/696661/+merge/45014
--
https://code.launchpad.net/~chrisjohnston/loco-directory/696661/+merge/45014
Your team loco-directory-dev is requested to review the proposed merge of
lp:~chrisjohnston/loco-directory/696661 into lp:loco-directory.
=== modified file 'loco_directory/teams/models.py'
--- loco_directory/teams/models.py 2010-12-25 08:02:40 +0000
+++ loco_directory/teams/models.py 2011-01-03 01:14:56 +0000
@@ -85,7 +85,7 @@
default=True)
approved = models.BooleanField(_("Approved Team"), default=False)
approved_date = models.DateField(_("Date Approved"), null=True, blank=True)
- expires_date = models.DateField(_("Date Expires"), null=True, blank=True)
+ expires_date = models.DateField(_("Reapproval Date"), null=True, blank=True)
owner_profile = models.ForeignKey(UserProfile, related_name='owner', null=True)
admin_profiles = models.ManyToManyField(UserProfile, related_name='admins')
contact_profiles = models.ManyToManyField(UserProfile, related_name='contacts')
=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html 2010-12-25 08:02:40 +0000
+++ loco_directory/templates/teams/team_detail.html 2011-01-03 01:14:56 +0000
@@ -146,7 +146,7 @@
{% endif %}
{% if team.approved %}
<tr>
- <th class="form-item-label" scope="row"><label>{% trans "Expires Date:" %}</label></th>
+ <th class="form-item-label" scope="row"><label>{% trans "Reapproval Date:" %}</label></th>
<td class="form-item-value">{{ team.expires_date }}</td>
</tr>
{% 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
