diff options
| -rw-r--r-- | django/core/management/validation.py | 12 | ||||
| -rw-r--r-- | tests/modeltests/invalid_models/models.py | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/django/core/management/validation.py b/django/core/management/validation.py index 06b891b32a..0e6d8b200f 100644 --- a/django/core/management/validation.py +++ b/django/core/management/validation.py @@ -45,18 +45,20 @@ def get_validation_errors(outfile, app=None): except (ValueError, TypeError): e.add(opts, '"%s": CharFields require a "max_length" attribute that is a positive integer.' % f.name) if isinstance(f, models.DecimalField): + decimalp_msg ='"%s": DecimalFields require a "decimal_places" attribute that is a non-negative integer.' try: decimal_places = int(f.decimal_places) - if decimal_places <= 0: - e.add(opts, '"%s": DecimalFields require a "decimal_places" attribute that is a positive integer.' % f.name) + if decimal_places < 0: + e.add(opts, decimalp_msg % f.name) except (ValueError, TypeError): - e.add(opts, '"%s": DecimalFields require a "decimal_places" attribute that is a positive integer.' % f.name) + e.add(opts, decimalp_msg % f.name) + mdigits_msg = '"%s": DecimalFields require a "max_digits" attribute that is a positive integer.' try: max_digits = int(f.max_digits) if max_digits <= 0: - e.add(opts, '"%s": DecimalFields require a "max_digits" attribute that is a positive integer.' % f.name) + e.add(opts, mdigits_msg % f.name) except (ValueError, TypeError): - e.add(opts, '"%s": DecimalFields require a "max_digits" attribute that is a positive integer.' % f.name) + e.add(opts, mdigits_msg % f.name) if isinstance(f, models.FileField) and not f.upload_to: e.add(opts, '"%s": FileFields require an "upload_to" attribute.' % f.name) if isinstance(f, models.ImageField): diff --git a/tests/modeltests/invalid_models/models.py b/tests/modeltests/invalid_models/models.py index 9a389cae86..86a4584e56 100644 --- a/tests/modeltests/invalid_models/models.py +++ b/tests/modeltests/invalid_models/models.py @@ -189,11 +189,11 @@ class UniqueM2M(models.Model): model_errors = """invalid_models.fielderrors: "charfield": CharFields require a "max_length" attribute that is a positive integer. invalid_models.fielderrors: "charfield2": CharFields require a "max_length" attribute that is a positive integer. invalid_models.fielderrors: "charfield3": CharFields require a "max_length" attribute that is a positive integer. -invalid_models.fielderrors: "decimalfield": DecimalFields require a "decimal_places" attribute that is a positive integer. +invalid_models.fielderrors: "decimalfield": DecimalFields require a "decimal_places" attribute that is a non-negative integer. invalid_models.fielderrors: "decimalfield": DecimalFields require a "max_digits" attribute that is a positive integer. -invalid_models.fielderrors: "decimalfield2": DecimalFields require a "decimal_places" attribute that is a positive integer. +invalid_models.fielderrors: "decimalfield2": DecimalFields require a "decimal_places" attribute that is a non-negative integer. invalid_models.fielderrors: "decimalfield2": DecimalFields require a "max_digits" attribute that is a positive integer. -invalid_models.fielderrors: "decimalfield3": DecimalFields require a "decimal_places" attribute that is a positive integer. +invalid_models.fielderrors: "decimalfield3": DecimalFields require a "decimal_places" attribute that is a non-negative integer. invalid_models.fielderrors: "decimalfield3": DecimalFields require a "max_digits" attribute that is a positive integer. invalid_models.fielderrors: "filefield": FileFields require an "upload_to" attribute. invalid_models.fielderrors: "choices": "choices" should be iterable (e.g., a tuple or list). |