diff --git a/greenmine/base/users/models.py b/greenmine/base/users/models.py index 4145c411..017817d4 100644 --- a/greenmine/base/users/models.py +++ b/greenmine/base/users/models.py @@ -42,5 +42,5 @@ class Role(models.Model): verbose_name_plural = u'roles' ordering = ['slug'] - def __unicode__(self): + def __str__(self): return self.name diff --git a/greenmine/projects/documents/models.py b/greenmine/projects/documents/models.py index 1c779d2b..d260784a 100644 --- a/greenmine/projects/documents/models.py +++ b/greenmine/projects/documents/models.py @@ -42,7 +42,7 @@ class Document(models.Model): ('view_documents', 'Can modify owned documents'), ) - def __unicode__(self): + def __str__(self): return self.title def save(self, *args, **kwargs): diff --git a/greenmine/projects/issues/models.py b/greenmine/projects/issues/models.py index b53bd778..df5ed220 100644 --- a/greenmine/projects/issues/models.py +++ b/greenmine/projects/issues/models.py @@ -26,7 +26,7 @@ class Priority(models.Model): ordering = ["project", "name"] unique_together = ("project", "name") - def __unicode__(self): + def __str__(self): return u"project {0} - {1}".format(self.project_id, self.name) @@ -42,7 +42,7 @@ class Severity(models.Model): ordering = ["project", "name"] unique_together = ("project", "name") - def __unicode__(self): + def __str__(self): return u"project {0} - {1}".format(self.project_id, self.name) @@ -60,7 +60,7 @@ class IssueStatus(models.Model): ordering = ["project", "name"] unique_together = ("project", "name") - def __unicode__(self): + def __str__(self): return u"project {0} - {1}".format(self.project_id, self.name) @@ -76,7 +76,7 @@ class IssueType(models.Model): ordering = ["project", "name"] unique_together = ("project", "name") - def __unicode__(self): + def __str__(self): return u"project {0} - {1}".format(self.project_id, self.name) @@ -145,7 +145,7 @@ class Issue(models.Model, WatchedMixin): ("view_issue", "Can view the issue"), ) - def __unicode__(self): + def __str__(self): return u"({1}) {0}".format(self.ref, self.subject) def save(self, *args, **kwargs): diff --git a/greenmine/projects/milestones/models.py b/greenmine/projects/milestones/models.py index b53b1aed..df2d391b 100644 --- a/greenmine/projects/milestones/models.py +++ b/greenmine/projects/milestones/models.py @@ -54,7 +54,7 @@ class Milestone(models.Model, WatchedMixin): ("view_milestone", "Can view milestones"), ) - def __unicode__(self): + def __str__(self): return self.name def __repr__(self): diff --git a/greenmine/projects/models.py b/greenmine/projects/models.py index b36eeee7..e14fb1fb 100644 --- a/greenmine/projects/models.py +++ b/greenmine/projects/models.py @@ -40,7 +40,7 @@ class Attachment(models.Model): verbose_name_plural = u"attachments" ordering = ["project", "created_date"] - def __unicode__(self): + def __str__(self): return u"content_type {0} - object_id {1} - attachment {2}".format( self.content_type, self.object_id, self.id) @@ -108,7 +108,7 @@ class Project(models.Model, WatchedMixin): ("manage_users", "Can manage users"), ) - def __unicode__(self): + def __str__(self): return self.name def __repr__(self): diff --git a/greenmine/projects/questions/models.py b/greenmine/projects/questions/models.py index 997b66a2..830a1948 100644 --- a/greenmine/projects/questions/models.py +++ b/greenmine/projects/questions/models.py @@ -31,7 +31,7 @@ class QuestionStatus(models.Model): ordering = ["project", "name"] unique_together = ("project", "name") - def __unicode__(self): + def __str__(self): return u"project {0} - {1}".format(self.project_id, self.name) @@ -92,7 +92,7 @@ class Question(models.Model, WatchedMixin): ("view_question", _(u"Can view the question")), ) - def __unicode__(self): + def __str__(self): return self.subject def save(self, *args, **kwargs): diff --git a/greenmine/projects/tasks/models.py b/greenmine/projects/tasks/models.py index ed8d1106..877fede0 100644 --- a/greenmine/projects/tasks/models.py +++ b/greenmine/projects/tasks/models.py @@ -30,7 +30,7 @@ class TaskStatus(models.Model): ordering = ["project", "name"] unique_together = ("project", "name") - def __unicode__(self): + def __str__(self): return u"project {0} - {1}".format(self.project_id, self.name) @@ -94,7 +94,7 @@ class Task(models.Model, WatchedMixin): ("add_task_to_us", "Can add tasks to a user story"), ) - def __unicode__(self): + def __str__(self): return u"({1}) {0}".format(self.ref, self.subject) def save(self, *args, **kwargs): diff --git a/greenmine/projects/userstories/models.py b/greenmine/projects/userstories/models.py index b48c260f..3d86f841 100644 --- a/greenmine/projects/userstories/models.py +++ b/greenmine/projects/userstories/models.py @@ -29,7 +29,7 @@ class UserStoryStatus(models.Model): ordering = ["project", "name"] unique_together = ("project", "name") - def __unicode__(self): + def __str__(self): return u"project {0} - {1}".format(self.project_id, self.name) @@ -49,7 +49,7 @@ class Points(models.Model): ordering = ["project", "name"] unique_together = ("project", "name") - def __unicode__(self): + def __str__(self): return u"project {0} - {1}".format(self.project_id, self.name) @@ -129,7 +129,7 @@ class UserStory(WatchedMixin, models.Model): ("add_userstory_to_milestones", "Can add user stories to milestones"), ) - def __unicode__(self): + def __str__(self): return u"({1}) {0}".format(self.ref, self.subject) def __repr__(self):