Fix full address to only provide the fields that are defined.

This commit is contained in:
2013-04-06 03:12:17 +01:00
parent b3e0367563
commit 8fb85e54f7

View File

@@ -159,15 +159,16 @@ class Address(models.Model):
@property @property
def full_address(self): def full_address(self):
return u', '.join([ fields = [
self.address1, self.address1,
self.address2, self.address2,
self.address3, self.address3,
self.city, self.city,
unicode(self.county), self.county.name,
self.postcode, self.postcode,
unicode(self.country), self.country.name,
]) ]
return ', '.join([f for f in fields if f])
@property @property
def address_string(self): def address_string(self):