NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 09:28:38 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fixed bug where queries were being cached

Browse Source
This commit is contained in:
Jeremy Stretch 2016-06-21 18:34:32 -04:00
parent 9cd299f009
commit f42c0643e0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/utilities/views.py
View File

@ -41,7 +41,7 @@ class ObjectListView(View):
if request.GET.get('export'): if request.GET.get('export'):
et = get_object_or_404(ExportTemplate, content_type=object_ct, name=request.GET.get('export')) et = get_object_or_404(ExportTemplate, content_type=object_ct, name=request.GET.get('export'))
try: try:
response = et.to_response(context_dict={'queryset': self.queryset}, response = et.to_response(context_dict={'queryset': self.queryset.all()},
filename='netbox_{}'.format(self.queryset.model._meta.verbose_name_plural)) filename='netbox_{}'.format(self.queryset.model._meta.verbose_name_plural))
return response return response
except TemplateSyntaxError: except TemplateSyntaxError:
@ -49,7 +49,7 @@ class ObjectListView(View):
.format(et.name)) .format(et.name))
# Fall back to built-in CSV export # Fall back to built-in CSV export
elif 'export' in request.GET and hasattr(model, 'to_csv'): elif 'export' in request.GET and hasattr(model, 'to_csv'):
output = '\n'.join([obj.to_csv() for obj in self.queryset]) output = '\n'.join([obj.to_csv() for obj in self.queryset.all()])
response = HttpResponse( response = HttpResponse(
output, output,
content_type='text/csv' content_type='text/csv'
@ -85,7 +85,8 @@ class ObjectListView(View):
return render(request, self.template_name, context) return render(request, self.template_name, context)
def alter_queryset(self, request): def alter_queryset(self, request):
return self.queryset # .all() is necessary to avoid caching queries
return self.queryset.all()
def extra_context(self): def extra_context(self):
return {} return {}