X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/bfcf39c1ff103ab78ca8d1ee7d22c044d1b5e7cb..121349bc707dc31a4e1dd46392960ba02aada1d1:/forum/models/user.py diff --git a/forum/models/user.py b/forum/models/user.py index afb33d3..f00f378 100644 --- a/forum/models/user.py +++ b/forum/models/user.py @@ -113,7 +113,7 @@ class User(BaseModel, DjangoUser): is_approved = models.BooleanField(default=False) email_isvalid = models.BooleanField(default=False) - reputation = models.PositiveIntegerField(default=0) + reputation = models.IntegerField(default=0) gold = models.PositiveIntegerField(default=0) silver = models.PositiveIntegerField(default=0) bronze = models.PositiveIntegerField(default=0) @@ -176,7 +176,8 @@ class User(BaseModel, DjangoUser): return md5(self.email.lower()).hexdigest() def save(self, *args, **kwargs): - if self.reputation < 0: + # If the community doesn't allow negative reputation, set it to 0 + if not settings.ALLOW_NEGATIVE_REPUTATION and self.reputation < 0: self.reputation = 0 new = not bool(self.id) @@ -205,15 +206,25 @@ class User(BaseModel, DjangoUser): @models.permalink def get_asked_url(self): - return ('user_questions', (), {'mode': _('asked-by'), 'user': self.id, 'slug': slugify(self.username)}) + return ('user_questions', (), {'mode': _('asked-by'), 'user': self.id, 'slug': slugify(smart_unicode(self.username))}) + + @models.permalink + def get_user_subscriptions_url(self): + return ('user_subscriptions', (), { 'id': self.id, 'slug': slugify(smart_unicode(self.username))}) @models.permalink def get_answered_url(self): return ('user_questions', (), {'mode': _('answered-by'), 'user': self.id, 'slug': slugify(self.username)}) - @models.permalink def get_subscribed_url(self): - return ('user_questions', (), {'mode': _('subscribed-by'), 'user': self.id, 'slug': slugify(self.username)}) + try: + # Try to retrieve the Subscribed User URL. + url = reverse('user_questions', + kwargs={'mode': _('subscribed-by'), 'user': self.id, 'slug': slugify(smart_unicode(self.username))}) + return url + except Exception, e: + # If some Exception has been raised, don't forget to log it. + logging.error("Error retrieving a subscribed user URL: %s" % e) def get_profile_link(self): profile_link = u'%s' % (self.get_profile_url(), self.username)