1
0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00

Fixes #581: Corrected initialization of custom boolean and select fields

This commit is contained in:
Jeremy Stretch
2016-09-28 09:58:59 -04:00
parent 187a6dee17
commit 35b3d8e33a

View File

@ -30,8 +30,8 @@ def get_custom_fields_for_model(content_type, filterable_only=False, bulk_edit=F
elif cf.type == CF_TYPE_BOOLEAN: elif cf.type == CF_TYPE_BOOLEAN:
choices = ( choices = (
(None, '---------'), (None, '---------'),
(True, 'True'), (1, 'True'),
(False, 'False'), (0, 'False'),
) )
if cf.default.lower() in ['true', 'yes', '1']: if cf.default.lower() in ['true', 'yes', '1']:
initial = True initial = True
@ -93,7 +93,7 @@ class CustomFieldForm(forms.ModelForm):
existing_values = CustomFieldValue.objects.filter(obj_type=self.obj_type, obj_id=self.instance.pk)\ existing_values = CustomFieldValue.objects.filter(obj_type=self.obj_type, obj_id=self.instance.pk)\
.select_related('field') .select_related('field')
for cfv in existing_values: for cfv in existing_values:
self.initial['cf_{}'.format(str(cfv.field.name))] = cfv.value self.initial['cf_{}'.format(str(cfv.field.name))] = cfv.serialized_value
def _save_custom_fields(self): def _save_custom_fields(self):