Fix #194: use formfield_callback to assume HTTPS scheme. (#195)

* fix #194: use formfield_callback to assume HTTPS scheme

* test: test scheme of URLField

* fix: option only exists since Django 5.0

Author: M3nace

extra_settings/forms.py

@@ -1,14 +1,27 @@
-from django import forms
+from django import VERSION, forms
 from django.conf import settings
+from django.db import models
 
 from extra_settings.models import Setting
 from extra_settings.utils import enforce_uppercase_setting
 
 
+def urlfields_assume_scheme(field, **kwargs):
+    """
+    ModelForm.Meta.formfield_callback function to set assume_scheme for scheme-less
+    domains in URLFields. Only since Django version 5.0.
+    """
+    if isinstance(field, models.URLField) and VERSION >= (5, 0):
+        kwargs["assume_scheme"] = "https"
+
+    return field.formfield(**kwargs)
+
+
 class SettingForm(forms.ModelForm):
     class Meta:
         model = Setting
         fields = "__all__"
+        formfield_callback = urlfields_assume_scheme
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

tests/test_forms.py

@@ -1,3 +1,4 @@
+from django import VERSION
 from django.test import TestCase
 
 from extra_settings.forms import SettingForm
@@ -34,3 +35,18 @@ def test_form_with_optional_data(self):
         }
         form_obj = SettingForm(data=form_data)
         self.assertTrue(form_obj.is_valid())
+
+    def test_form_assume_scheme(self):
+        form_data = {
+            "name": "PACKAGE_NAME",
+            "value_type": Setting.TYPE_URL,
+            "description": "A URL field",
+            "value_url": "example.com",
+        }
+        form_obj = SettingForm(data=form_data)
+        self.assertTrue(form_obj.is_valid())
+
+        if VERSION >= (5, 0):
+            self.assertEqual(form_obj.cleaned_data["value_url"], "https://example.com")
+        else:
+            self.assertEqual(form_obj.cleaned_data["value_url"], "http://example.com")