diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-07-03 20:01:56 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-07-03 20:01:56 +0200 |
| commit | 953a9dfb33a96dbaa4fa69ad7c43555574764d1c (patch) | |
| tree | 5e510cca9ace14ca3f51c1107f702931d4f74211 /ishtar/templates | |
| parent | 867cd6346514e040b21fa38fdc52ec0e82d1827d (diff) | |
| download | Ishtar-953a9dfb33a96dbaa4fa69ad7c43555574764d1c.tar.bz2 Ishtar-953a9dfb33a96dbaa4fa69ad7c43555574764d1c.zip | |
Correct Context records creation (closes #496)
Diffstat (limited to 'ishtar/templates')
| -rw-r--r-- | ishtar/templates/sheet_file.html | 2 | ||||
| -rw-r--r-- | ishtar/templates/sheet_operation.html | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ishtar/templates/sheet_file.html b/ishtar/templates/sheet_file.html index 1ba043239..ea5842991 100644 --- a/ishtar/templates/sheet_file.html +++ b/ishtar/templates/sheet_file.html @@ -47,7 +47,7 @@ {% if item.address_complement %}<p><label>{%trans "Complement:"%}</label> <span class='value'>{{ item.address_complement }}</span></p>{%endif%} {% if item.postal_code %}<p><label>{%trans "Postal code:"%}</label> <span class='value'>{{ item.postal_code }}</span></p>{%endif%} -<p><label>{%trans "Surface:"%}</label> <span class='value'>{{ item.total_surface }} m<sup>2</sup> ({{ item.total_surface_ha }} ha)</span></p> +<p><label>{%trans "Surface:"%}</label>{% if item.total_surface %} <span class='value'>{{ item.total_surface }} m<sup>2</sup> ({{ item.total_surface_ha }} ha)</span>{%endif%}</p> diff --git a/ishtar/templates/sheet_operation.html b/ishtar/templates/sheet_operation.html index b2713602f..5919d8922 100644 --- a/ishtar/templates/sheet_operation.html +++ b/ishtar/templates/sheet_operation.html @@ -130,8 +130,8 @@ </tr> {% for context_record in item.context_record.all %} <tr> - <td>{{ context_record.label }}</td> - <td class='string'>{{context_record.unit}}</td> + <td class='string'>{{ context_record.label }}</td> + <td class='string'>{{context_record.unit|default:""}}</td> <td class='string'>{{ context_record.datings.all|join:", " }}</td>{# periods ?#} <td class='string'>{{ context_record.description }}</td> <td class='string'>{{ context_record.parcel.section }} - {{context_record.parcel.parcel_number}}</td> |