inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-04 04:30:56 +00:00
Code Activity

Use a checkbox input when editing a boolean setting

Browse Source
This commit is contained in:
Oliver Walters
2020-10-25 21:00:06 +11:00
parent f1e8afa314
commit 3a325399c6
3 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
InvenTree/common/models.py
View File

@ -11,6 +11,7 @@ import decimal
from django.db import models
from django.conf import settings
from django.utils.translation import ugettext as _
from django.core.validators import MinValueValidator, MaxValueValidator
from django.core.exceptions import ValidationError
@ -287,11 +288,11 @@ class InvenTreeSetting(models.Model):
return
print("Running validator:", validator, self.key, self.value)
# Check if a 'type' has been specified for this value
if type(validator) == type:
if validator == bool:
# Value must "look like" a boolean value
if InvenTree.helpers.is_bool(self.value):
# Coerce into either "True" or "False"
self.value = str(InvenTree.helpers.str2bool(self.value))
@ -300,8 +301,6 @@ class InvenTreeSetting(models.Model):
'value': _('Value must be a boolean value')
})
def validate_unique(self, exclude=None):
""" Ensure that the key:value pair is unique.
In addition to the base validators, this ensures that the 'key'
@ -317,6 +316,15 @@ class InvenTreeSetting(models.Model):
except InvenTreeSetting.DoesNotExist:
pass
def is_bool(self):
"""
Check if this setting is required to be a boolean value
"""
validator = InvenTreeSetting.get_setting_validator(self.key)
return validator == bool
class Currency(models.Model):
"""