From b3cca1d851847ac3a8d6191848afba8ffb98368f Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sat, 11 May 2019 18:07:37 +1000
Subject: [PATCH] Improve form management when possible part matches are found

- Display the checkbox always
- Display a warning message above the form
---
 InvenTree/part/templates/part/create_part.html | 3 ++-
 InvenTree/part/views.py                        | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/InvenTree/part/templates/part/create_part.html b/InvenTree/part/templates/part/create_part.html
index 25e0d66597..30bbf099f1 100644
--- a/InvenTree/part/templates/part/create_part.html
+++ b/InvenTree/part/templates/part/create_part.html
@@ -5,7 +5,8 @@
 {{ block.super }}
 
 {% if matches %}
-<b>Matching Parts</b>
+<b>Possible Matching Parts</b>
+<p>The new part may be a duplicate of these existing parts:</p>
 <ul class='list-group'>
 {% for match in matches %}
 <li class='list-group-item list-group-item-condensed'>
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index 29431788f7..890cb8a519 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -191,13 +191,16 @@ class PartCreate(AjaxCreateView):
             if len(matches) > 0:
                 context['matches'] = matches
             
+                # Enforce display of the checkbox
+                form.fields['confirm_creation'].widget = CheckboxInput()
+                
                 # Check if the user has checked the 'confirm_creation' input
                 confirmed = str2bool(request.POST.get('confirm_creation', False))
 
                 if not confirmed:
-                    form.fields['confirm_creation'].widget = CheckboxInput()
                     form.errors['confirm_creation'] = ['Possible matches exist - confirm creation of new part']
-                    form.non_field_errors = 'Possible matches exist - confirm creation of new part'
+                    
+                    form.pre_form_warning = 'Possible matches exist - confirm creation of new part'
                     valid = False
 
         data = {