From f10181c013adb11a3629ccf2905f8bf1d0ec1433 Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Fri, 10 Mar 2017 00:07:23 +0100 Subject: Context records table: add new fields and reorder --- archaeological_context_records/models.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'archaeological_context_records') diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 1ec32ea83..2b43635ac 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -144,9 +144,8 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, ValueGetter, ShortMenuItem): SHOW_URL = 'show-contextrecord' SLUG = 'contextrecord' - TABLE_COLS = ['parcel__town__name', 'operation__year', - 'operation__operation_code', - 'label', 'unit'] + TABLE_COLS = ['label', 'parcel__town__name', 'operation__common_name', + 'parcel__label', 'unit'] if settings.COUNTRY == 'fr': TABLE_COLS.insert(1, 'operation__code_patriarche') TABLE_COLS_FOR_OPE = ['label', 'parcel', 'unit', -- cgit v1.2.3 From 83a5855c7bb49f0caca9b18d01579688b6490380 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 13 Mar 2017 13:54:25 +0100 Subject: Sheets: add ishtar ID (refs #3517) --- .../templates/ishtar/sheet_contextrecord.html | 18 +++--------- archaeological_files/models.py | 5 ++++ .../templates/ishtar/sheet_file.html | 27 +++++------------- .../templates/ishtar/sheet_find.html | 32 +++++++++------------- archaeological_operations/models.py | 4 +++ .../templates/ishtar/sheet_operation.html | 3 +- .../templates/ishtar/sheet_container.html | 6 ++-- .../templates/ishtar/sheet_warehouse.html | 7 +++-- example_project/settings.py | 1 + ishtar_common/static/media/style.css | 4 +++ .../ishtar/blocks/sheet_creation_section.html | 19 +++++++++++++ .../templates/ishtar/blocks/sheet_external_id.html | 7 +++++ version.py | 2 +- 13 files changed, 76 insertions(+), 59 deletions(-) create mode 100644 ishtar_common/templates/ishtar/blocks/sheet_creation_section.html create mode 100644 ishtar_common/templates/ishtar/blocks/sheet_external_id.html (limited to 'archaeological_context_records') diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index 1c024dcfc..7ba34fd13 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -12,23 +12,13 @@

{{ item.parcel.short_label }}

{{ item.label|default:"" }}

+{% include "ishtar/blocks/sheet_external_id.html" %}