Prevent recursive BOMs

- If A has B in its BOM, A cannot be added to the BOM of B
This commit is contained in:
Oliver 2018-04-27 23:42:23 +10:00
parent 06f9c67b11
commit f49474ace5
3 changed files with 16 additions and 2 deletions

View File

@ -11,7 +11,8 @@ https://docs.djangoproject.com/en/1.10/ref/settings/
"""
import os
import logging
import logging.config
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@ -28,6 +29,12 @@ DEBUG = True
ALLOWED_HOSTS = []
if DEBUG:
# will output to your console
logging.basicConfig(
level = logging.DEBUG,
format = '%(asctime)s %(levelname)s %(message)s',
)
# Application definition

View File

@ -353,9 +353,13 @@ class BomItem(models.Model):
def clean(self):
# A part cannot refer to itself in its BOM
if self.part == self.sub_part:
raise ValidationError(_('A part cannot contain itself as a BOM item'))
for item in self.sub_part.bom_items.all():
if self.part == item.sub_part:
raise ValidationError(_("Part '{p1}' is used in BOM for '{p2}' (recursive)".format(p1=str(self.part), p2=str(self.sub_part))))
class Meta:
verbose_name = "BOM Item"

View File

@ -60,7 +60,10 @@ $(document).ready(function(){
var button = $(this);
launchDeleteForm("#modal-delete",
button.attr('url'));
button.attr('url'),
{
reload: true
});
});
$('#bom-table').on('click', '.edit-row-button', function () {