damned-lies r1209 - in trunk: . people teams templates

[claudep svn gnome org]

Author: claudep
Date: Mon Dec  8 17:36:21 2008
New Revision: 1209
URL: http://svn.gnome.org/viewvc/damned-lies?rev=1209&view=rev

Log:
2008-12-08  Claude Paroz  <claude 2xlibre net>

	* people/models.py:
	* teams/models.py: Use EmailField for email content fields.
	* templates/person_base.html: Omitted fixes for no_spam... function names.

Modified:
   trunk/ChangeLog
   trunk/people/models.py
   trunk/teams/models.py
   trunk/templates/person_base.html

Modified: trunk/people/models.py
==============================================================================
--- trunk/people/models.py	(original)
+++ trunk/people/models.py	Mon Dec  8 17:36:21 2008
@@ -13,7 +13,7 @@
     image = models.URLField(null=True, blank=True)
     webpage_url = models.URLField(null=True, blank=True)
     irc_nick = models.SlugField(max_length=20, null=True, blank=True)
-    bugzilla_account = models.SlugField(null=True, blank=True)
+    bugzilla_account = models.EmailField(null=True, blank=True)
 
     # Use UserManager to get the create_user method, etc.
     objects = UserManager()

Modified: trunk/teams/models.py
==============================================================================
--- trunk/teams/models.py	(original)
+++ trunk/teams/models.py	Mon Dec  8 17:36:21 2008
@@ -31,7 +31,7 @@
     # Don't confuse this relation with the 'groups' one
     coordinator = models.ForeignKey(Person, related_name='coordinates_teams')
     webpage_url = models.URLField(null=True, blank=True)
-    mailing_list = models.URLField(null=True, blank=True)
+    mailing_list = models.EmailField(null=True, blank=True)
     mailing_list_subscribe = models.URLField(null=True, blank=True)
 
     class Meta:

Modified: trunk/templates/person_base.html
==============================================================================
--- trunk/templates/person_base.html	(original)
+++ trunk/templates/person_base.html	Mon Dec  8 17:36:21 2008
@@ -12,8 +12,8 @@
 
   <a style="font-size: 140%;" href="{{ person.get_absolute_url }}">{{ person.name }}</a><br />
 
-  {% if person.nospamemail %}
-    <a href="mailto:{{ person.nospamemail }}">{{ person.nospamemail }}</a><br />
+  {% if person.no_spam_email %}
+    <a href="mailto:{{ person.no_spam_email }}">{{ person.no_spam_email }}</a><br />
   {% endif %}
   {% if person.webpage_url %}
     <a href="{{ person.webpage_url }}">{{ person.webpage_url }}</a><br />
@@ -27,8 +27,8 @@
     </ul>
   {% endif %}
 
-  {% if person.nospambugzillaaccount %}
-    <strong>{% trans "Bugzilla account:" %}</strong> {{ person.nospambugzillaaccount }}<br />
+  {% if person.no_spam_bugzilla_account %}
+    <strong>{% trans "Bugzilla account:" %}</strong> {{ person.no_spam_bugzilla_account }}<br />
   {% endif %}
 
   {% if person.svn_account %}