Merge branch 'develop' into feature

This commit is contained in:
Jeremy Stretch
2024-12-12 12:13:45 -05:00
64 changed files with 89446 additions and 76844 deletions

View File

@@ -1,5 +1,3 @@
import traceback
from django.contrib import messages
from django.db import transaction
from django.db.models import Prefetch, Sum
@@ -444,7 +442,8 @@ class VirtualMachineRenderConfigView(generic.ObjectView):
# If a direct export has been requested, return the rendered template content as a
# downloadable file.
if request.GET.get('export'):
response = HttpResponse(context['rendered_config'], content_type='text')
content = context['rendered_config'] or context['error_message']
response = HttpResponse(content, content_type='text')
filename = f"{instance.name or 'config'}.txt"
response['Content-Disposition'] = f'attachment; filename="{filename}"'
return response
@@ -462,17 +461,18 @@ class VirtualMachineRenderConfigView(generic.ObjectView):
# Render the config template
rendered_config = None
error_message = None
if config_template := instance.get_config_template():
try:
rendered_config = config_template.render(context=context_data)
except TemplateError as e:
messages.error(request, _("An error occurred while rendering the template: {error}").format(error=e))
rendered_config = traceback.format_exc()
error_message = _("An error occurred while rendering the template: {error}").format(error=e)
return {
'config_template': config_template,
'context_data': context_data,
'rendered_config': rendered_config,
'error_message': error_message,
}