diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-10 09:03:35 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-10 09:03:35 +0100 |
| commit | 7bca0329dca7c9ef33e03fa632b2c1b3a64b986e (patch) | |
| tree | 4bdc92defc26eb5f976511d8003d534050a42698 | |
| parent | 44b229ddd0d3be6256806502d7b16c6fb16eb2d1 (diff) | |
| parent | 96952d232e9db999233d2632184b4770f8000034 (diff) | |
| download | Ishtar-7bca0329dca7c9ef33e03fa632b2c1b3a64b986e.tar.bz2 Ishtar-7bca0329dca7c9ef33e03fa632b2c1b3a64b986e.zip | |
Merge branch 'v0.9' into wheezy
| -rw-r--r-- | CHANGES.md | 5 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 3 | ||||
| -rw-r--r-- | version.py | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md index 460381c07..380b93a59 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,11 @@ Ishtar changelog ================ +v0.99.12.1 (2017-02-10) +----------------------- +### Features ### +- Sheet find: add comment + v0.99.12 (2017-02-10) --------------------- ### Features ### diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 4ae6dbffe..94685b63d 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -33,9 +33,10 @@ {% endwith %} {% endif %} {% field_li "Administrative index" item.administrative_index %} -{% if item.description %} +{% if item.description or item.comment %} </ul> {% field "Description" item.description "<pre>" "</pre>" %} +{% field "Comment" item.comment "<pre>" "</pre>" %} <ul class='form-flex'> {% endif %} {% field_li_multiple "Material types" item.material_types %} diff --git a/version.py b/version.py index e5d838a62..2d724201c 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -VERSION = (0, 99, 12) +VERSION = (0, 99, 12, 1) def get_version(): |