inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-02 13:28:49 +00:00
Code

More fixes

Browse Source
This commit is contained in:
Oliver Walters 2020-11-13 21:01:30 +11:00
parent 03e852f957
commit 5f9758e85f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
InvenTree/common/models.py
View File

@ -9,6 +9,7 @@ from __future__ import unicode_literals
import os import os
from django.db import models from django.db import models
from django.db.utils import IntegrityError
from django.conf import settings from django.conf import settings
import djmoney.settings import djmoney.settings
@ -283,10 +284,13 @@ class InvenTreeSetting(models.Model):
setting = InvenTreeSetting.objects.filter(key__iexact=key).first() setting = InvenTreeSetting.objects.filter(key__iexact=key).first()
except (ValueError, InvenTreeSetting.DoesNotExist): except (ValueError, InvenTreeSetting.DoesNotExist):
setting = None setting = None
except (IntegrityError):
setting = None
if not setting: if not setting:
# Attempt Create the setting if it does not exist # Return a new setting object if it does not already exist
setting = InvenTreeSetting.objects.create( # Do not save it to the database, though
setting = InvenTreeSetting(
key=key, key=key,
value=InvenTreeSetting.get_setting_default(key) value=InvenTreeSetting.get_setting_default(key)
) )