Skip to content
This repository has been archived by the owner on Oct 28, 2020. It is now read-only.

Commit

Permalink
Merge pull request #941 from akatsoulas/action-items-unicode
Browse files Browse the repository at this point in the history
[fix bug 1138370] Fix unicode error when creating action items.
  • Loading branch information
akatsoulas committed Mar 2, 2015
2 parents d819d26 + 0281bec commit 01bfdac
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions remo/voting/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,13 @@ class Vote(models.Model):
date_voted = models.DateField(auto_now_add=True)

def __unicode__(self):
return '%s %s' % (self.user, self.poll)
return u'{0} {1}'.format(self.user, self.poll)

def save(self, *args, **kwargs):
if self.poll.automated_poll:
name = '{0} {1}'.format(BUDGET_VOTE_ACTION, self.poll.bug.summary)
name = u'{0} {1}'.format(BUDGET_VOTE_ACTION, self.poll.bug.summary)
else:
name = '{0} {1}'.format(VOTE_ACTION, self.poll.name)
name = u'{0} {1}'.format(VOTE_ACTION, self.poll.name)

super(Vote, self).save(*args, **kwargs)
ActionItem.resolve(instance=self.poll, user=self.user,
Expand Down

0 comments on commit 01bfdac

Please sign in to comment.