Merge pull request #74 from WHOIGit/develop

Bug fixes for v1.3.0, update to v1.3.1

roundabout/inventory/forms.py

@@ -106,13 +106,14 @@ def __init__(self, *args, **kwargs):
                         options_dict = field.choice_field_options
                         options_list = [('', '- select one -')]
 
-                        for option in options_dict['options']:
-                            value = option['value']
-                            label = value
-                            if option['label']:
-                                label = option['label']
-                            form_option = (value, label)
-                            options_list.append(form_option)
+                        if options_dict:
+                            for option in options_dict['options']:
+                                value = option['value']
+                                label = value
+                                if option['label']:
+                                    label = option['label']
+                                form_option = (value, label)
+                                options_list.append(form_option)
 
                         FIELD_CHOICES = (options_list)
                         self.fields['udffield_' + str(field.id)] = forms.ChoiceField(label=str(field.field_name), required=False,

roundabout/userdefinedfields/migrations/0005_auto_20200517_1814.py

@@ -0,0 +1,22 @@
+# Generated by Django 2.2.10 on 2020-05-17 18:14
+
+from django.apps import apps
+from django.db import migrations
+
+FieldValue = apps.get_model('userdefinedfields', 'FieldValue')
+
+def remove_nulls(apps, schema_editor):
+    for fv in FieldValue.objects.all():
+        if fv.field_value is None:
+            fv.field_value = ''
+            fv.save()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('userdefinedfields', '0004_auto_20200421_0056'),
+    ]
+
+    operations = [
+        migrations.RunPython(remove_nulls),
+    ]

roundabout/userdefinedfields/migrations/0006_auto_20200517_1822.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.10 on 2020-05-17 18:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('userdefinedfields', '0005_auto_20200517_1814'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='fieldvalue',
+            name='field_value',
+            field=models.TextField(blank=True),
+        ),
+    ]

roundabout/userdefinedfields/models.py

@@ -49,7 +49,7 @@ def __str__(self):
 
 
 class FieldValue(models.Model):
-    field_value = models.TextField(null=True, blank=True)
+    field_value = models.TextField(null=False, blank=True)
     field = models.ForeignKey(Field, related_name='fieldvalues',
                           on_delete=models.CASCADE, null=False, blank=False)
     inventory = models.ForeignKey('inventory.Inventory', related_name='fieldvalues',
@@ -82,11 +82,14 @@ def get_field_value(self):
 
         # Check if field is ChoiceField, set the value to the label if available
         if self.field.field_type == 'ChoiceField':
-            options_list= self.field.choice_field_options['options']
+            try:
+                options_list= self.field.choice_field_options['options']
 
-            for option in options_list:
-                if option['value'] == self.field_value and option['label']:
-                    print(option['label'])
-                    return option['label']
+                for option in options_list:
+                    if option['value'] == self.field_value and option['label']:
+                        print(option['label'])
+                        return option['label']
+            except:
+                pass
 
         return self.field_value