projects
/
htsworkflow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 cda52a308f994fe673dd65b73f4ad94b0bc8c1ea..32d63a35d545fafc9f2f78ca295364db266d11a3 100644
(file)
--- a/
htsworkflow/frontend/samples/models.py
+++ b/
htsworkflow/frontend/samples/models.py
@@
-271,13
+271,14
@@
class HTSUser(User):
#objects = UserManager()
class Meta:
#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):
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.username) + u" (" + unicode(self.get_full_name()) + u")"
+ return unicode(self.get_full_name()) + u' (' + unicode(self.username) + ')'
def HTSUserInsertID(sender, instance, **kwargs):
"""
def HTSUserInsertID(sender, instance, **kwargs):
"""