From f16e30d07859678a24d2e9aec2e79a2c122feca8 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 9 May 2023 15:16:39 +0200 Subject: Sheet town: layout improvement, display associated operation, site, files --- example_project/settings.py | 1 + ishtar_common/admin.py | 5 +---- ishtar_common/templates/ishtar/sheet_town.html | 31 +++++++++++++++++++++----- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/example_project/settings.py b/example_project/settings.py index ed70a6b59..d6bc19bcd 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -111,6 +111,7 @@ USE_I18N = True # If you set this to False, Django will not format dates, numbers and # calendars according to the current locale USE_L10N = True +USE_THOUSAND_SEPARATOR = True LANGUAGES = ( ("fr", "Français"), ("en", "English"), diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index 068a697b0..44044d77e 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -1125,10 +1125,7 @@ class ImportJSONActionAdmin(admin.ModelAdmin): class AdminTownForm(forms.ModelForm): class Meta: model = models_common.Town - exclude = ["imports", "departement"] - - center = PointField(label=_("Center"), required=False, widget=OSMWidget) - limit = MultiPolygonField(label=_("Limit"), required=False, widget=OSMWidget) + exclude = ["imports", "center", "limit"] class TownParentInline(admin.TabularInline): diff --git a/ishtar_common/templates/ishtar/sheet_town.html b/ishtar_common/templates/ishtar/sheet_town.html index 2b0cf6e4b..4f154f40d 100644 --- a/ishtar_common/templates/ishtar/sheet_town.html +++ b/ishtar_common/templates/ishtar/sheet_town.html @@ -1,5 +1,5 @@ {% extends "ishtar/sheet.html" %} -{% load i18n ishtar_helpers window_tables window_header window_field from_dict link_to_window %} +{% load i18n l10n ishtar_helpers window_tables window_header window_field from_dict link_to_window %} {% block head_title %}{% trans "Town" %} - {{item.name}}{% if item.numero_insee %} ({{item.numero_insee}}){% endif %}{% endblock %} @@ -20,6 +20,9 @@ {% with perm_documents=permission_view_own_document|or_:permission_view_document %} {% with has_documents=item|safe_or:"documents.count|documents_list" %} {% with display_documents=perm_documents|and_:has_documents %} +{% with perm_files=permission_view_own_file|or_:permission_view_file %} +{% with perm_operations=permission_view_own_operation|or_:permission_view_operation %} +{% with perm_sites=permission_view_own_archaeologicalsite|or_:permission_view_archaeologicalsite %} {% if output != "ODT" and output != "PDF" %}