Ticket #22925: extra_required.patch

django/docs/topics/forms/modelforms.txt

@@ -608 +608 @@
     on fields and their arguments.
 
 
+If you want to make fields required, which are not required
+by model design, you can specify them in ``extra_required`` property
+of Meta::
+
+
+    from django.db import models
+    from django.forms import ModelForm
+
+    # `title` and `author` are not required in model..
+    class Book(models.Model):
+        title = models.CharField(max_length=100, blank=True)
+        author = models.CharField(max_length=100, blank=True)
+
+    # ..but they may become so in `extra_required`
+    class BookForm(ModelForm):
+
+        class Meta:
+            model = Book
+            fields = ['title', 'author']
+            extra_required = ['title', 'author']
+
+
+
 Enabling localization of fields
 -------------------------------
 

django/tests/model_forms/tests.py

@@ -515 +515 @@
         self.assertEqual(list(OrderFields2.base_fields),
                          ['slug', 'name'])
 
+    def test_extra_required_fields_in_form_meta(self):
+        class FormWithExtraRequiredInMeta(forms.ModelForm):
+            """For this test we specify fields,
+            which are NOT required in model, and
+            make sure, that they become required after
+            specifying them in Meta.extra_required.
+            """
+            class Meta:
+                model = Book
+                fields = ['author', 'special_id']
+                extra_required = ['author', 'special_id']
+        self.assertEqual([f.required for f in FormWithExtraRequiredInMeta.base_fields.itervalues()],
+                         [True, True])
+
 
 class FieldOverridesByFormMetaForm(forms.ModelForm):
     class Meta:

django/django/forms/models.py

@@ -231 +231 @@
         self.model = getattr(options, 'model', None)
         self.fields = getattr(options, 'fields', None)
         self.exclude = getattr(options, 'exclude', None)
+        self.extra_required = getattr(options, 'extra_required', None)
         self.widgets = getattr(options, 'widgets', None)
         self.localized_fields = getattr(options, 'localized_fields', None)
         self.labels = getattr(options, 'labels', None)
@@ -298 +299 @@
             fields = new_class.declared_fields
 
         new_class.base_fields = fields
+
+        # Need to set field.required, if it's in 'extra_required'
+        # of ModelForm Meta class.
+        for field_name in new_class.base_fields.keys():
+            if opts.extra_required and field_name in opts.extra_required:
+                setattr(new_class.base_fields[field_name], 'required', True)
 
         return new_class