inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 12:06:44 +00:00
Code

Fixed duplicate check

Browse Source
This commit is contained in:
eeintech 2021-05-13 16:06:57 -04:00
parent a1fa3315b1
commit 22249206d2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
InvenTree/common/views.py
View File

@ -209,6 +209,7 @@ class FileManagementFormView(MultiStepFormView):
context.update({'columns': self.columns}) context.update({'columns': self.columns})
# Load extra context data # Load extra context data
print(self.extra_context_data)
for key, items in self.extra_context_data.items(): for key, items in self.extra_context_data.items():
context.update({key: items}) context.update({key: items})
@ -449,8 +450,8 @@ class FileManagementFormView(MultiStepFormView):
if guess: if guess:
n = list(self.column_selections.values()).count(self.column_selections[col]) n = list(self.column_selections.values()).count(self.column_selections[col])
if n > 1: if n > 1 and self.column_selections[col] not in duplicates:
duplicates.append(col) duplicates.append(self.column_selections[col])
# Store extra context data # Store extra context data
self.extra_context_data = { self.extra_context_data = {

2
InvenTree/order/templates/order/order_wizard/match_fields.html
View File

@ -55,7 +55,7 @@
<td> <td>
{{ col }} {{ col }}
{% for duplicate in duplicates %} {% for duplicate in duplicates %}
{% if duplicate == col.name %} {% if duplicate == col.value %}
<div class='alert alert-danger alert-block text-center' role='alert' style='padding:2px; margin-top:6px; margin-bottom:2px'> <div class='alert alert-danger alert-block text-center' role='alert' style='padding:2px; margin-top:6px; margin-bottom:2px'>
<b>{% trans "Duplicate selection" %}</b> <b>{% trans "Duplicate selection" %}</b>
</div> </div>