From d25bf18531424f3adfe189c2adf2ffe77248ef52 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 8 Sep 2016 17:29:03 +0200 Subject: Operation: fix parcel display in last panel --- archaeological_operations/forms.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'archaeological_operations') diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 4564eb37b..15db8be31 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -157,9 +157,8 @@ class ParcelForm(forms.Form): else: c_number = 0 values = [town, data.get('year') or '', data.get('section') or '', - c_number, str(data.get('parcel_number') or '') - + str(u"Public domain") if data.get('public_domain') - else u""] + c_number, unicode(_(u"public domain")) + if data.get('public_domain') else u""] if data.get('DELETE'): deleted.append(values) else: @@ -177,7 +176,8 @@ class ParcelForm(forms.Form): grouped = [] for keys, parcel_grp in groupby(parcels, key=sortkeyfn): keys = list(keys) - keys.append([gp[-1] for gp in parcel_grp]) + keys.append([u' '.join([unicode(gp[-2]), unicode(gp[-1])]) + for gp in parcel_grp]) grouped.append(keys) res = '' c_town, c_section = '', '' -- cgit v1.2.3