Merge pull request #20 from uptick/fix/default-values

TW-216 Custom field defaults not being set.

Author: ryanjohndunne

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-user-defined-fields"
-version = "0.0.17"
+version = "0.0.18"
 description = "A Django app for user defined fields"
 authors = ["Aidan Lister <aidan@uptickhq.com>"]
 license = "MIT"

userdefinedfields/fields.py

@@ -11,10 +11,19 @@
 
 class ExtraFieldsJSONField(JSONField):
     def __init__(self, *args, **kwargs):
-        kwargs["default"] = dict
+        kwargs["default"] = self.get_default
         kwargs["blank"] = True
         super().__init__(*args, **kwargs)
 
+    def get_default(self):
+        ct = ContentType.objects.get_for_model(self.model)
+        relevant_fields = dict(
+            ExtraField.objects.filter(content_type=ct, default__isnull=False)
+            .exclude(default="")
+            .values_list("name", "default")
+        )
+        return relevant_fields
+
     def _get_EXTRAFIELD_fieldlist(self, obj, field, use_cache=False):
 
         # grab the relevant extrafields for this content type