mirror of
https://github.com/inventree/InvenTree.git
synced 2025-04-29 20:16:44 +00:00
Fix existing bug with BomExport functionality - could not select BOM format
This commit is contained in:
parent
611592694b
commit
707787d82c
@ -33,7 +33,6 @@ part_parameter_urls = [
|
|||||||
|
|
||||||
part_detail_urls = [
|
part_detail_urls = [
|
||||||
url(r'^delete/?', views.PartDelete.as_view(), name='part-delete'),
|
url(r'^delete/?', views.PartDelete.as_view(), name='part-delete'),
|
||||||
url(r'^bom-export/?', views.BomExport.as_view(), name='bom-export'),
|
|
||||||
url(r'^bom-download/?', views.BomDownload.as_view(), name='bom-download'),
|
url(r'^bom-download/?', views.BomDownload.as_view(), name='bom-download'),
|
||||||
|
|
||||||
url(r'^pricing/', views.PartPricing.as_view(), name='part-pricing'),
|
url(r'^pricing/', views.PartPricing.as_view(), name='part-pricing'),
|
||||||
|
@ -1060,7 +1060,7 @@ class BomDownload(AjaxView):
|
|||||||
|
|
||||||
part = get_object_or_404(Part, pk=self.kwargs['pk'])
|
part = get_object_or_404(Part, pk=self.kwargs['pk'])
|
||||||
|
|
||||||
export_format = request.GET.get('file_format', 'csv')
|
export_format = request.GET.get('format', 'csv')
|
||||||
|
|
||||||
cascade = str2bool(request.GET.get('cascade', False))
|
cascade = str2bool(request.GET.get('cascade', False))
|
||||||
|
|
||||||
@ -1103,55 +1103,6 @@ class BomDownload(AjaxView):
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class BomExport(AjaxView):
|
|
||||||
""" Provide a simple form to allow the user to select BOM download options.
|
|
||||||
"""
|
|
||||||
|
|
||||||
model = Part
|
|
||||||
ajax_form_title = _("Export Bill of Materials")
|
|
||||||
|
|
||||||
role_required = 'part.view'
|
|
||||||
|
|
||||||
def post(self, request, *args, **kwargs):
|
|
||||||
|
|
||||||
# Extract POSTed form data
|
|
||||||
fmt = request.POST.get('file_format', 'csv').lower()
|
|
||||||
cascade = str2bool(request.POST.get('cascading', False))
|
|
||||||
levels = request.POST.get('levels', None)
|
|
||||||
parameter_data = str2bool(request.POST.get('parameter_data', False))
|
|
||||||
stock_data = str2bool(request.POST.get('stock_data', False))
|
|
||||||
supplier_data = str2bool(request.POST.get('supplier_data', False))
|
|
||||||
manufacturer_data = str2bool(request.POST.get('manufacturer_data', False))
|
|
||||||
|
|
||||||
try:
|
|
||||||
part = Part.objects.get(pk=self.kwargs['pk'])
|
|
||||||
except:
|
|
||||||
part = None
|
|
||||||
|
|
||||||
# Format a URL to redirect to
|
|
||||||
if part:
|
|
||||||
url = reverse('bom-download', kwargs={'pk': part.pk})
|
|
||||||
else:
|
|
||||||
url = ''
|
|
||||||
|
|
||||||
url += '?file_format=' + fmt
|
|
||||||
url += '&cascade=' + str(cascade)
|
|
||||||
url += '¶meter_data=' + str(parameter_data)
|
|
||||||
url += '&stock_data=' + str(stock_data)
|
|
||||||
url += '&supplier_data=' + str(supplier_data)
|
|
||||||
url += '&manufacturer_data=' + str(manufacturer_data)
|
|
||||||
|
|
||||||
if levels:
|
|
||||||
url += '&levels=' + str(levels)
|
|
||||||
|
|
||||||
data = {
|
|
||||||
'form_valid': part is not None,
|
|
||||||
'url': url,
|
|
||||||
}
|
|
||||||
|
|
||||||
return self.renderJsonResponse(request, self.form_class(), data=data)
|
|
||||||
|
|
||||||
|
|
||||||
class PartDelete(AjaxDeleteView):
|
class PartDelete(AjaxDeleteView):
|
||||||
""" View to delete a Part object """
|
""" View to delete a Part object """
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user