Merge pull request #524 from devartis/master

Set default decimal_places value to settings configuration and use de…
django-money · Nov 7, 2019 · a4a47f6 · a4a47f6
2 parents a8df354 + 784afbd
commit a4a47f6
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/djmoney/models/fields.py b/djmoney/models/fields.py
@@ -166,7 +166,7 @@ def __init__(
         verbose_name=None,
         name=None,
         max_digits=None,
-        decimal_places=None,
+        decimal_places=DECIMAL_PLACES,
         default=None,
         default_currency=DEFAULT_CURRENCY,
         currency_choices=CURRENCY_CHOICES,
@@ -275,7 +275,7 @@ def get_default(self):
             return super().get_default()
 
     def formfield(self, **kwargs):
-        defaults = {"form_class": forms.MoneyField, "decimal_places": DECIMAL_PLACES}
+        defaults = {"form_class": forms.MoneyField, "decimal_places": self.decimal_places}
         defaults.update(kwargs)
         defaults["currency_choices"] = self.currency_choices
         defaults["default_currency"] = self.default_currency

diff --git a/tests/test_form.py b/tests/test_form.py
@@ -13,6 +13,7 @@
 
 from .testapp.forms import (
     DefaultMoneyModelForm,
+    DefaultPrecisionModelForm,
     DisabledFieldForm,
     MoneyForm,
     MoneyFormMultipleCurrencies,
@@ -185,8 +186,17 @@ def test_has_changed(self):
         assert not form.has_changed()
 
 
-@pytest.mark.parametrize("model_class", (PreciseForm, PreciseModelForm))
+@pytest.mark.parametrize("model_class", (PreciseForm, DefaultPrecisionModelForm))
 def test_decimal_places_model_form(model_class):
-    """Forms should use DECIMAL_PLACES setting value."""
+    """Forms should use DECIMAL_PLACES setting value when none specified."""
+
     expected = str(10 ** -settings.DECIMAL_PLACES)
     assert model_class().fields["money"].widget.widgets[0].attrs["step"] == expected
+
+
+def test_precedence_decimal_places_model_form():
+    """Forms should use decimal_places in field value when specified."""
+
+    decimal_places = PreciseModelForm.Meta.model._meta.fields[2].decimal_places
+    expected = str(10 ** -decimal_places)
+    assert PreciseModelForm().fields["money"].widget.widgets[0].attrs["step"] == expected
diff --git a/tests/testapp/forms.py b/tests/testapp/forms.py
@@ -9,6 +9,7 @@
 
 from .models import (
     ModelWithDefaultAsString,
+    ModelWithDefaultPrecision,
     ModelWithValidation,
     ModelWithVanillaMoneyField,
     NullMoneyFieldModel,
@@ -49,6 +50,12 @@ class Meta:
         fields = ("money",)
 
 
+class DefaultPrecisionModelForm(forms.ModelForm):
+    class Meta:
+        model = ModelWithDefaultPrecision
+        fields = ("money",)
+
+
 class MoneyModelFormWithValidation(forms.ModelForm):
     class Meta:
         model = ModelWithValidation

diff --git a/tests/testapp/models.py b/tests/testapp/models.py
@@ -189,3 +189,7 @@ class CryptoModel(models.Model):
 
 class PreciseModel(models.Model):
     money = MoneyField(max_digits=10, decimal_places=4)
+
+
+class ModelWithDefaultPrecision(models.Model):
+    money = MoneyField(max_digits=10)