inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-31 21:25:42 +00:00
Code Activity

Small refactor, and allow editing of ReportAsset in the admin interface

Browse Source
This commit is contained in:
Oliver Walters
2021-02-03 21:54:11 +11:00
parent 90bef69a59
commit cbadb2a888
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/report/admin.py
View File

@@ -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)

11
InvenTree/report/models.py
View File

@@ -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()