Refine user handling.

[htsworkflow.git] / htsworkflow / frontend / samples / models.py

diff --git a/htsworkflow/frontend/samples/models.py b/htsworkflow/frontend/samples/models.py
index a5b3327047dab5faf5cbcb08668a3135a1fee020..32d63a35d545fafc9f2f78ca295364db266d11a3 100644 (file)
--- a/htsworkflow/frontend/samples/models.py
+++ b/htsworkflow/frontend/samples/models.py
@@ -104,7 +104,7 @@ class Affiliation(models.Model):
   name = models.CharField(max_length=256, db_index=True, verbose_name='Name')
   contact = models.CharField(max_length=256, null=True, blank=True,verbose_name='Lab Name')  
   email = models.EmailField(null=True,blank=True)
-  users = models.ManyToManyField('HTSUser', null=True)
+  users = models.ManyToManyField('HTSUser', null=True, blank=True)
   users.admin_order_field = "username"
   
   def __unicode__(self):
@@ -271,10 +271,14 @@ class HTSUser(User):
     #objects = UserManager()
 
     class Meta:
-        ordering = ['username']
+        ordering = ['first_name', 'last_name', 'username']
 
     def admin_url(self):
         return '/admin/%s/%s/%d' % (self._meta.app_label, self._meta.module_name, self.id)
+
+    def __unicode__(self):
+        #return unicode(self.username) + u" (" + unicode(self.get_full_name()) + u")"
+        return unicode(self.get_full_name()) + u' (' + unicode(self.username) + ')'
     
 def HTSUserInsertID(sender, instance, **kwargs):
     """