diff options
| -rw-r--r-- | CHANGES.md | 2 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md index 4af5eed6a..20ffd0be9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,8 @@ date: 2022-12-05 --- ### Features/improvements ### +- Sheet: set default permissions to False +- Find sheet: do not display container information if no permission ### Bug fixes ### - Full text search: add "simple" config in search diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 1ccfbad8e..45544d415 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -26,6 +26,7 @@ {% with non_modif_treatments_count=item.non_modif_treatments_count %} {% with associated_treatment_files_count=item.associated_treatment_files_count %} +{% with can_view_container=permission_view_own_container|or_:permission_view_container %} {% with display_warehouse_treatments=item.container|or_:item.container_ref|or_:item.upstream_treatment|or_:item.downstream_treatment|or_:non_modif_treatments_count|or_:associated_treatment_files_count %} {% with can_view_documents=permission_view_own_document|or_:permission_view_document %} {% with display_documents=can_view_documents|and_:item.documents_count %} @@ -300,6 +301,7 @@ {% endif %} {% endcomment %} {% if item.container or item.container_ref %} + {% if can_view_container %} <h3>{% trans "Warehouse - container" %}</h3> <div class='row'> {% if item.container_ref != item.container and item.container_ref %} @@ -372,6 +374,15 @@ {% endif %} </div> {% endif %} + + + <div class="alert alert-info" role="alert"> + <i class="fa fa-info-circle" aria-hidden="true"></i> + {% trans "Container information not available." %} + </div> + + + {% endif %} {% if item.upstream_treatment or item.downstream_treatment or non_modif_treatments_count %} {% if non_modif_treatments_count %} <h3>{% trans "Simple treatments"%}</h3> @@ -560,7 +571,7 @@ {% endif %} </div> -{% endwith %} {% endwith %} {% endwith %} {% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %} +{% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %} {% endblock %} |