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

[Chris Johnston]

[lp:~cjohnston/loco-team-portal/681981]

327. By Chris Johnston on 2010-11-27

Merging in mhall119's fix

=== modified file 'loco_directory/teams/models.py'
--- loco_directory/teams/models.py	2010-09-30 11:17:29 +0000
+++ loco_directory/teams/models.py	2010-11-27 03:54:25 +0000
@@ -19,6 +19,9 @@
 class Continent(models.Model):
     name = models.TextField(_("Name"), max_length=50)
     
+    class Meta:
+        ordering = ('name',)
+        
     def __unicode__(self):
         return u'%s' % (self.name)
 
@@ -38,6 +41,9 @@
     name = models.TextField(_("Name"), max_length=100)
     continents = models.ManyToManyField(Continent)
     
+    class Meta:
+        ordering = ('name',)
+    
     def __unicode__(self):
         return u'%s' % (self.name)
 

=== modified file 'loco_directory/userprofiles/models.py'
--- loco_directory/userprofiles/models.py	2010-11-19 04:23:16 +0000
+++ loco_directory/userprofiles/models.py	2010-11-27 03:54:25 +0000
@@ -22,6 +22,9 @@
     aim = models.CharField(verbose_name=_('AOL IM Nick'), max_length=32, blank=True, null=True)
     xmpp = models.CharField(verbose_name=_('XMPP IM Nick'), max_length=32, blank=True, null=True)
 
+    class Meta:
+        ordering = ('user__username',)
+        
     def __unicode__(self):
         try:
             if self.realname: