diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-08 17:29:03 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-08 17:29:03 +0200 |
| commit | d25bf18531424f3adfe189c2adf2ffe77248ef52 (patch) | |
| tree | 53f2c607f716a0375bea40d2291dfd85a9fd6c33 | |
| parent | 472dafdad56d6d9ddf12d9200da9002d25b77055 (diff) | |
| download | Ishtar-d25bf18531424f3adfe189c2adf2ffe77248ef52.tar.bz2 Ishtar-d25bf18531424f3adfe189c2adf2ffe77248ef52.zip | |
Operation: fix parcel display in last panel
| -rw-r--r-- | archaeological_operations/forms.py | 8 |
1 files changed, 4 insertions, 4 deletions
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 = '', '' |