mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
simpler code
This commit is contained in:
parent
8168db8061
commit
b9c73b1e60
@ -145,11 +145,11 @@ class MatchItem(forms.Form):
|
|||||||
for col in row['data']:
|
for col in row['data']:
|
||||||
# Get column matching
|
# Get column matching
|
||||||
col_guess = col['column'].get('guess', None)
|
col_guess = col['column'].get('guess', None)
|
||||||
|
# Set field name
|
||||||
|
field_name = col_guess.lower() + '-' + str(row['index'])
|
||||||
|
|
||||||
# Create input for required headers
|
# Create input for required headers
|
||||||
if col_guess in file_manager.REQUIRED_HEADERS:
|
if col_guess in file_manager.REQUIRED_HEADERS:
|
||||||
# Set field name
|
|
||||||
field_name = col_guess.lower() + '-' + str(row['index'])
|
|
||||||
# Set field input box
|
# Set field input box
|
||||||
|
|
||||||
# TODO maybe not here but in an own function?
|
# TODO maybe not here but in an own function?
|
||||||
@ -201,8 +201,6 @@ class MatchItem(forms.Form):
|
|||||||
|
|
||||||
# Optional entries
|
# Optional entries
|
||||||
elif col_guess in file_manager.OPTIONAL_HEADERS:
|
elif col_guess in file_manager.OPTIONAL_HEADERS:
|
||||||
# Set field name
|
|
||||||
field_name = col_guess.lower() + '-' + str(row['index'])
|
|
||||||
# Get value
|
# Get value
|
||||||
value = row.get(col_guess.lower(), '')
|
value = row.get(col_guess.lower(), '')
|
||||||
# Set field input box
|
# Set field input box
|
||||||
@ -227,8 +225,6 @@ class MatchItem(forms.Form):
|
|||||||
item_options = [(option.id, option) for option in row['match_options_' + col_guess]]
|
item_options = [(option.id, option) for option in row['match_options_' + col_guess]]
|
||||||
# Get item match
|
# Get item match
|
||||||
item_match = row['match_' + col_guess]
|
item_match = row['match_' + col_guess]
|
||||||
# Set field name
|
|
||||||
field_name = col_guess.lower() + '-' + str(row['index'])
|
|
||||||
# Set field select box
|
# Set field select box
|
||||||
self.fields[field_name] = forms.ChoiceField(
|
self.fields[field_name] = forms.ChoiceField(
|
||||||
choices=[('', '-' * 10)] + item_options,
|
choices=[('', '-' * 10)] + item_options,
|
||||||
|
Loading…
Reference in New Issue
Block a user