From 8fb85e54f7b3bedb58e057c42532fd8bc93ad7f4 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Sat, 6 Apr 2013 03:12:17 +0100
Subject: [PATCH] Fix full address to only provide the fields that are defined.

---
 app/stores/models/base.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/stores/models/base.py b/app/stores/models/base.py
index 5597bcb..9e4032d 100644
--- a/app/stores/models/base.py
+++ b/app/stores/models/base.py
@@ -159,15 +159,16 @@ class Address(models.Model):
 
     @property
     def full_address(self):
-        return u', '.join([
+        fields = [
             self.address1,
             self.address2,
             self.address3,
             self.city,
-            unicode(self.county),
+            self.county.name,
             self.postcode,
-            unicode(self.country),
-            ])
+            self.country.name,
+            ]
+        return ', '.join([f for f in fields if f])
 
     @property
     def address_string(self):