diff --git a/inventree_kicad/KiCadLibraryPlugin.py b/inventree_kicad/KiCadLibraryPlugin.py index 7374e45..8d7b116 100644 --- a/inventree_kicad/KiCadLibraryPlugin.py +++ b/inventree_kicad/KiCadLibraryPlugin.py @@ -7,7 +7,6 @@ """ import datetime -import json from django.core.validators import URLValidator @@ -162,6 +161,17 @@ def import_meta_data(self, request): # noqa if request.FILES.get('file', False): file = request.FILES.get('file', False) + kicad_footprint_param_id = self.plugin.get_setting('KICAD_SYMBOL_PARAMETER', None) + kicad_reference_param_id = self.plugin.get_setting('KICAD_SYMBOL_PARAMETER', None) + kicad_symbol_param_id = self.plugin.get_setting('KICAD_SYMBOL_PARAMETER', None) + + if kicad_footprint_param_id is None or kicad_reference_param_id is None or kicad_symbol_param_id is None: + return JsonResponse( + { + 'error': 'Missing parameters. Please make sure you have selected appropriate parameters in the settings before attempting to import anything.' + }, + status=422) + # Make sure we have got a xml file if 'xml' not in file.content_type: return JsonResponse({'error': 'XML file expected!'}, status=422) @@ -174,20 +184,6 @@ def import_meta_data(self, request): # noqa components = root.find('components') inventree_parts = set() - # create dict from selection - field_name_matching = json.loads(request.POST['fieldNameMatching']) - - # user needs to match all KiCad Parameter - if 'false' in field_name_matching.values(): - return JsonResponse( - {'error': 'Some KiCad Parameters were not matched with an InvenTree parameter.'}, - status=406 - ) - - kicad_footprint_param_id = field_name_matching['Footprint'] - kicad_reference_param_id = field_name_matching['Reference'] - kicad_symbol_param_id = field_name_matching['Symbol'] - # Iterate through all child components with the tag 'comp' for idx, comp in enumerate(components.findall('comp')): diff --git a/inventree_kicad/templates/inventree_kicad/kicad_bom_import.html b/inventree_kicad/templates/inventree_kicad/kicad_bom_import.html index 4d04d81..69b1475 100644 --- a/inventree_kicad/templates/inventree_kicad/kicad_bom_import.html +++ b/inventree_kicad/templates/inventree_kicad/kicad_bom_import.html @@ -5,18 +5,7 @@