inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-27 19:16:44 +00:00
Code

Report bugfix (#9013) (#9014)

Browse Source 
- Ensure default label templates exist
- Ensure default report templates exist

(cherry picked from commit 2a6434ead89443b075adf48d12afd21fbb47443b)

Co-authored-by: Oliver <oliver.henry.walters@gmail.com>
This commit is contained in:
github-actions[bot] 2025-02-03 08:03:59 +11:00 committed by GitHub
parent b0fc42d906
commit 0f9bddbcd2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/backend/InvenTree/report/apps.py
View File

@ -7,6 +7,7 @@ from pathlib import Path
from django.apps import AppConfig
from django.core.exceptions import AppRegistryNotReady
from django.core.files.base import ContentFile
from django.core.files.storage import default_storage
from django.db.utils import IntegrityError, OperationalError, ProgrammingError
from maintenance_mode.core import maintenance_mode_on, set_maintenance_mode
@ -55,6 +56,18 @@ class ReportConfig(AppConfig):
set_maintenance_mode(False)
def file_from_template(self, dir_name: str, file_name: str) -> ContentFile:
"""Construct a new ContentFile from a template file."""
logger.info('Creating %s template file: %s', dir_name, file_name)
return ContentFile(
Path(__file__)
.parent.joinpath('templates', dir_name, file_name)
.open('r')
.read(),
os.path.basename(file_name),
)
def create_default_labels(self):
"""Create default label templates."""
# Test if models are ready
@ -106,29 +119,25 @@ class ReportConfig(AppConfig):
]
for template in label_templates:
# Ignore matching templates which are already in the database
if report.models.LabelTemplate.objects.filter(
name=template['name']
).exists():
continue
filename = template.pop('file')
template_file = Path(__file__).parent.joinpath(
'templates', 'label', filename
)
if not template_file.exists():
logger.warning("Missing template file: '%s'", template['name'])
# Template already exists in the database - check that the file exists too
if existing_template := report.models.LabelTemplate.objects.filter(
name=template['name'], model_type=template['model_type']
).first():
if not default_storage.exists(existing_template.template.name):
# The file does not exist in the storage system - add it in
existing_template.template = self.file_from_template(
'label', filename
)
existing_template.save()
continue
# Read the existing template file
data = template_file.open('r').read()
# Otherwise, create a new entry
try:
# Create a new entry
report.models.LabelTemplate.objects.create(
**template, template=ContentFile(data, os.path.basename(filename))
**template, template=self.file_from_template('label', filename)
)
logger.info("Creating new label template: '%s'", template['name'])
except Exception:
@ -202,29 +211,24 @@ class ReportConfig(AppConfig):
]
for template in report_templates:
# Ignore matching templates which are already in the database
if report.models.ReportTemplate.objects.filter(
name=template['name']
).exists():
continue
filename = template.pop('file')
template_file = Path(__file__).parent.joinpath(
'templates', 'report', filename
)
if not template_file.exists():
logger.warning("Missing template file: '%s'", template['name'])
# Template already exists in the database - check that the file exists too
if existing_template := report.models.ReportTemplate.objects.filter(
name=template['name'], model_type=template['model_type']
).first():
if not default_storage.exists(existing_template.template.name):
# The file does not exist in the storage system - add it in
existing_template.template = self.file_from_template(
'report', filename
)
existing_template.save()
continue
# Read the existing template file
data = template_file.open('r').read()
# Create a new entry
# Otherwise, create a new entry
try:
report.models.ReportTemplate.objects.create(
**template, template=ContentFile(data, os.path.basename(filename))
**template, template=self.file_from_template('report', filename)
)
logger.info("Created new report template: '%s'", template['name'])
except Exception: