diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-04-29 18:57:22 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-04-29 19:02:35 +0200 |
| commit | e60ba1a6a27e9ed4068d16743e8e80a6adec7f1e (patch) | |
| tree | 05ddfd62f832f82be23038d4e182d7e0092c82b6 | |
| parent | 2a22abd01ddfdd903071fd59d736e4c8b919cdf1 (diff) | |
| download | Ishtar-e60ba1a6a27e9ed4068d16743e8e80a6adec7f1e.tar.bz2 Ishtar-e60ba1a6a27e9ed4068d16743e8e80a6adec7f1e.zip | |
Sheet: fix json display for context records and operations
| -rw-r--r-- | CHANGES.md | 7 | ||||
| -rw-r--r-- | archaeological_context_records/templates/ishtar/sheet_contextrecord.html | 6 | ||||
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_operation.html | 6 | ||||
| -rw-r--r-- | ishtar_common/version.py | 4 |
4 files changed, 15 insertions, 8 deletions
diff --git a/CHANGES.md b/CHANGES.md index fe828635b..7987c7e82 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,13 @@ Ishtar changelog ================ +v3.1.18 - 2021-04-29 +-------------------- + +### Bug fixes ### +- Sheet: json display for context records and operations +- Fix autocomplete container and default basket search + v3.1.17 - 2021-04-29 -------------------- diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index 72b06785b..a8be74542 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -90,9 +90,9 @@ {% endif %} {% if display_data %} <li class="nav-item"> - <a class="nav-link" id="{{window_id}}-json-tab" - data-toggle="tab" href="#{{window_id}}-json" role="tab" - aria-controls="{{window_id}}-json" aria-selected="false"> + <a class="nav-link" id="{{window_id}}-data-tab" + data-toggle="tab" href="#{{window_id}}-data" role="tab" + aria-controls="{{window_id}}-data" aria-selected="false"> {% trans "Custom fields" %} </a> </li> diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 35542d7cc..2afdb6c4c 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -87,9 +87,9 @@ {% endif %} {% if display_data %} <li class="nav-item"> - <a class="nav-link" id="{{window_id}}-json-tab" - data-toggle="tab" href="#{{window_id}}-json" role="tab" - aria-controls="{{window_id}}-json" aria-selected="false"> + <a class="nav-link" id="{{window_id}}-data-tab" + data-toggle="tab" href="#{{window_id}}-data" role="tab" + aria-controls="{{window_id}}-data" aria-selected="false"> {% trans "Custom fields" %} </a> </li> diff --git a/ishtar_common/version.py b/ishtar_common/version.py index f600e4c87..68cf8da97 100644 --- a/ishtar_common/version.py +++ b/ishtar_common/version.py @@ -1,5 +1,5 @@ -# 3.1.17 -VERSION = (3, 1, 17) +# 3.1.18 +VERSION = (3, 1, 18) def get_version(): |