diff options
| -rw-r--r-- | archaeological_finds/models_finds.py | 2 | ||||
| -rw-r--r-- | archaeological_warehouse/templates/ishtar/sheet_warehouse.html | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index b893951b7..2faf97d1d 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -937,7 +937,7 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem, 'cached_label': 'cached_label__icontains', 'documents__image__isnull': 'documents__image__isnull', 'container__location': 'container__location__pk', - 'container__responsible': 'container__responsible__pk', + 'container_ref__location': 'container_ref__location__pk', } for table in (TABLE_COLS, TABLE_COLS_FOR_OPE): for key in table: diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html index 1307425ff..dcaa12215 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html +++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html @@ -96,6 +96,24 @@ {% trans "No container inside this warehouse" %} </div> {% endif %} + {% if item.number_of_finds_hosted %} + <h4>{% trans "Finds (hosted)" %}</h4> + {% dynamic_table_document '' 'finds' 'container__location' item.pk 'TABLE_COLS' output %} + {% else %} + <div class="alert alert-info"> + <i class="fa fa-exclamation-triangle"></i> + {% trans "No find inside this warehouse" %} + </div> + {% endif %} + {% if item.number_of_finds %} + <h4>{% trans "Finds (owned)" %}</h4> + {% dynamic_table_document '' 'finds' 'container_ref__location' item.pk 'TABLE_COLS' output %} + {% else %} + <div class="alert alert-info"> + <i class="fa fa-exclamation-triangle"></i> + {% trans "No find owned by this warehouse" %} + </div> + {% endif %} </div> <div class="tab-pane fade" id="{{window_id}}-stats" |