From 57a1a81e9b0f7b5c2b16067da3b00865316c4ac0 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 15 Mar 2024 12:24:17 +1100 Subject: [PATCH] Reporting: Build line label fix (#6717) * Fix "BuildLine" label in PUI - Point to "buildline" not "build" * Prevent escape closing template ediror * Update report docs * Fix for format_number - Prevent number from being represented as scientific notation --- InvenTree/report/templatetags/report.py | 5 ++++- docs/docs/report/report.md | 4 ++++ .../src/components/nav/DetailDrawer.tsx | 3 +++ src/frontend/src/components/render/Build.tsx | 17 +++++++++++++++++ src/frontend/src/components/render/Instance.tsx | 3 ++- .../src/components/render/ModelType.tsx | 8 ++++++++ src/frontend/src/enums/ModelType.tsx | 1 + .../AdminCenter/TemplateManagementPanel.tsx | 14 +++++++------- .../src/tables/settings/TemplateTable.tsx | 1 + 9 files changed, 47 insertions(+), 9 deletions(-) diff --git a/InvenTree/report/templatetags/report.py b/InvenTree/report/templatetags/report.py index 6917271a40..aea2105abb 100644 --- a/InvenTree/report/templatetags/report.py +++ b/InvenTree/report/templatetags/report.py @@ -410,7 +410,10 @@ def format_number(number, **kwargs): except ValueError: pass - value = str(number) + # Re-encode, and normalize again + value = Decimal(number).normalize() + value = format(value, 'f') + value = str(value) leading = kwargs.get('leading', None) diff --git a/docs/docs/report/report.md b/docs/docs/report/report.md index e82ac5ead6..1bd05c3c6d 100644 --- a/docs/docs/report/report.md +++ b/docs/docs/report/report.md @@ -117,6 +117,7 @@ So, if you are writing a template which has custom formatting, (or any other sec ```html {% raw %} +{% load l10n %}