diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-06-23 14:21:39 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-28 12:15:20 +0100 |
| commit | 137400406965636e3f0a2540c7ea0fac2c7dbbde (patch) | |
| tree | 01906dd3c678fecf355bf79fdb872599ebb1baba | |
| parent | a8a99c748ba13ef394ff9006f0e192f320c459f1 (diff) | |
| download | Ishtar-137400406965636e3f0a2540c7ea0fac2c7dbbde.tar.bz2 Ishtar-137400406965636e3f0a2540c7ea0fac2c7dbbde.zip | |
Container: improve sheet layout
| -rw-r--r-- | archaeological_warehouse/models.py | 6 | ||||
| -rw-r--r-- | archaeological_warehouse/templates/ishtar/sheet_container.html | 11 |
2 files changed, 7 insertions, 10 deletions
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 97fa38c88..565b64af2 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -149,6 +149,10 @@ class Warehouse(Address, DocumentItem, GeoItem, QRCodeItem, DashboardFormItem, def __str__(self): return self.name + @property + def short_label(self): + return self.name + def natural_key(self): return (self.uuid, ) @@ -380,7 +384,6 @@ class WarehouseDivisionLinkManager(models.Manager): container_type__txt_idx=container_type) - class ContainerType(GeneralType): stationary = models.BooleanField( _("Stationary"), default=False, @@ -893,6 +896,7 @@ class Container(DocumentItem, Merge, LightHistorizedItem, QRCodeItem, GeoItem, while parent: localisations.append(parent) parent = parent.parent + localisations.append(self.location) return reversed(localisations) def get_localisation(self, place): diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html index 60f49b7ae..c9cbc3e0a 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_container.html +++ b/archaeological_warehouse/templates/ishtar/sheet_container.html @@ -2,11 +2,7 @@ {% load i18n window_header window_field window_tables link_to_window %} {% block head_title %}<strong>{% trans "Container" %}</strong> - -{% if item.cached_division %} -{{item.cached_division}} -{% else %} -{{ item.container_type|default:"" }} {{ item.reference|default:"" }} {% endif %} -- {{ item.location.name|default:"" }} +{{ item.reference|default:"" }} ({{ item.container_type|default:"" }}) - {{item.location}} {% endblock %} {% block toolbar %} @@ -35,9 +31,7 @@ {% else %} <div class="float-left row col-6 col-md-8"> {% endif %} - {% field_flex_detail "Warehouse" item.location %} - {% if item.parent %} - <dl class="col-12 col-md-9 flex-wrap"> + <dl class="col-12 flex-wrap"> <dt>{% trans "Location" %}</dt> <dd> <nav aria-label="breadcrumb"> @@ -51,7 +45,6 @@ </nav> </dd> </dl> - {% endif %} {% include "ishtar/blocks/sheet_creation_section.html" %} {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %} {% include "ishtar/blocks/sheet_json.html" %} |