Switch to using __unicode__ and django's smart __str__ handling, also added permalinks for HR models

This commit is contained in:
2010-12-07 11:02:18 +00:00
parent 9e6544062c
commit dcac0e24b0
4 changed files with 20 additions and 23 deletions

View File

@@ -34,8 +34,8 @@ class SSOUser(models.Model):
api_service_password = models.CharField("API Services Password", max_length=200, blank=True)
def __str__(self):
return self.user.__str__()
def __unicode__(self):
return self.user.__unicode__()
@staticmethod
def create_user_profile(sender, instance, created, **kwargs):
@@ -88,7 +88,7 @@ class Service(models.Model):
api.settings = self.settings
return api
def __str__(self):
def __unicode__(self):
return self.name
def save(self):
@@ -139,8 +139,8 @@ class ServiceAccount(models.Model):
verbose_name_plural = 'Service Accounts'
ordering = ['user']
def __str__(self):
return "%s: %s (%s)" % (self.service.name, self.user.username, self.service_uid)
def __unicode__(self):
return u"%s: %s (%s)" % (self.service.name, self.user.username, self.service_uid)
def save(self):
if self.id: