From bede78cf844a0703d3ee5bfff002c54c4339bd9a Mon Sep 17 00:00:00 2001 From: Robert Einsle Date: Sat, 4 Feb 2017 12:39:28 +0100 Subject: [PATCH] fix toString --- billard/models.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/billard/models.py b/billard/models.py index 9f7dd07..01f0bfa 100644 --- a/billard/models.py +++ b/billard/models.py @@ -58,10 +58,10 @@ class Client(models.Model): return self.accounting_for(2) def __str__(self): - return str(self.uuid) + return '{}, {}'.format(self.location.name, self.uuid) def __unicode__(self): - return str(self.client.location.name) + return '{}, {}'.format(self.location.name, self.uuid) class Accounting(models.Model): @@ -72,10 +72,10 @@ class Accounting(models.Model): prize = models.DecimalField(max_digits=5, decimal_places=2, blank=True, null=True) def __str__(self): - return self.client.location.name + return '{}: {} -> {}, {}'.format(self.client.uuid, self.time_from, self.time_to, self.prize) def __unicode__(self): - return self.client.location.name + return '{}: {} -> {}, {}'.format(self.client.uuid, self.time_from, self.time_to, self.prize) class Meta: ordering = ['-time_from']