diff --git a/api/models.py b/api/models.py index 2b5ed6b..0b1ab11 100644 --- a/api/models.py +++ b/api/models.py @@ -19,9 +19,6 @@ class AuthAPIKey(models.Model): def __unicode__(self): return self.name - def __str__(self): - return self.__unicode__() - class Meta: verbose_name = 'API Key' verbose_name_plural = "API Keys" diff --git a/hr/models.py b/hr/models.py index fea1339..5a3d52e 100644 --- a/hr/models.py +++ b/hr/models.py @@ -18,6 +18,10 @@ class Application(models.Model): verbose_name="Status", help_text="Current status of this application request.") + @models.permalink + def get_absolute_url(self): + return ('hr.views.view_application', [self.id]) + @property def blacklisted(self): if len(self.blacklist_values) > 0: @@ -97,9 +101,6 @@ class Application(models.Model): def __unicode__(self): return self.character.name - def __str__(self): - return self.__unicode__() - class Recommendation(models.Model): """ User recommendation for a application """ @@ -108,12 +109,13 @@ class Recommendation(models.Model): user_character = models.ForeignKey(EVEPlayerCharacter, blank=False, verbose_name="Recommender") application = models.ForeignKey(Application, blank=False, verbose_name="Recommended Application") + @models.permalink + def get_absolute_url(self): + return ('hr.views.view_application', [self.application.id]) + def __unicode__(self): return self.user_character.name - def __str__(self): - return self.__unicode__() - class Audit(models.Model): """ Auditing information regarding a application """ @@ -127,6 +129,13 @@ class Audit(models.Model): help_text="Detailed event text") date = models.DateTimeField(auto_now_add=True, verbose_name="Event Date") + @models.permalink + def get_absolute_url(self): + return ('hr.views.view_application', [self.application.id]) + + def __unicode__(self): + return u"(%s) %s: %s" % (self.get_event_display(), self.user, self.text) + class BlacklistSource(models.Model): """ Blacklist Source """ @@ -137,9 +146,6 @@ class BlacklistSource(models.Model): def __unicode__(self): return self.name - def __str__(self): - return self.__unicode__() - class Blacklist(models.Model): """ Blacklisted entries, stops people who match the criteria from applying """ @@ -158,6 +164,3 @@ class Blacklist(models.Model): def __unicode__(self): return u'%s: %s' % (self.get_type_display(), self.value) - - def __str__(self): - return self.__unicode__() diff --git a/reddit/models.py b/reddit/models.py index 9a91bd8..459c2a3 100644 --- a/reddit/models.py +++ b/reddit/models.py @@ -73,6 +73,3 @@ class RedditAccount(models.Model): def __unicode__(self): return self.username - - def __str__(self): - return self.__unicode__() diff --git a/sso/models.py b/sso/models.py index 4deed85..09bf928 100644 --- a/sso/models.py +++ b/sso/models.py @@ -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: