From cbadb2a888f20c64f6fbffd37e5829d95fbbb3ca Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 3 Feb 2021 21:54:11 +1100 Subject: [PATCH] Small refactor, and allow editing of ReportAsset in the admin interface --- InvenTree/report/admin.py | 2 +- InvenTree/report/models.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/InvenTree/report/admin.py b/InvenTree/report/admin.py index 32340921c3..5034934ccf 100644 --- a/InvenTree/report/admin.py +++ b/InvenTree/report/admin.py @@ -18,7 +18,7 @@ class ReportTemplateAdmin(admin.ModelAdmin): class ReportAssetAdmin(admin.ModelAdmin): - list_display = ('asset', 'description') + list_display = ('id', 'asset', 'description') admin.site.register(ReportSnippet, ReportSnippetAdmin) diff --git a/InvenTree/report/models.py b/InvenTree/report/models.py index 6b064999d5..ba8672f8c1 100644 --- a/InvenTree/report/models.py +++ b/InvenTree/report/models.py @@ -52,9 +52,7 @@ class TexResponse(HttpResponse): def rename_template(instance, filename): - filename = os.path.basename(filename) - - return os.path.join('report', 'report_template', instance.getSubdir(), filename) + return instance.rename_file(filename) def validate_stock_item_report_filters(filters): @@ -92,6 +90,13 @@ class ReportBase(models.Model): def getSubdir(self): return '' + def rename_file(self, filename): + # Function for renaming uploaded file + + filename = os.path.basename(filename) + + return os.path.join('report', 'report_template', self.getSubdir(), filename) + @property def extension(self): return os.path.splitext(self.template.name)[1].lower()