Changeset 7365 for django/branches/newforms-admin

Timestamp:

03/26/08 21:55:45 (10 months ago)

Author:

brosner

Message:

newforms-admin: Fixed #6889 -- ModelForm? nows supports media defined in the form.

Files:

• django/branches/newforms-admin/django/newforms/models.py (modified) (2 diffs)
• django/branches/newforms-admin/tests/modeltests/model_forms/models.py (modified) (1 diff)

django/branches/newforms-admin/django/newforms/models.py

@@ -15 +15 @@
-from fields import Field, ChoiceField, IntegerField, EMPTY_VALUES
-from widgets import Select, SelectMultiple, HiddenInput, MultipleHiddenInput
+from widgets import media_property
-from formsets import BaseFormSet, _formset_factory, DELETION_FIELD_NAME
-
@@ -227 +228 @@
-
-        new_class = type.__new__(cls, name, bases, attrs)
+        if 'media' not in attrs:
+            new_class.media = media_property(new_class)
-        declared_fields = get_declared_fields(bases, attrs, False)
-        opts = new_class._meta = ModelFormOptions(getattr(new_class, 'Meta', None))

django/branches/newforms-admin/tests/modeltests/model_forms/models.py

@@ -913 +913 @@
->>> instance.delete()
-
+# Media on a ModelForm ########################################################
+
+# Similar to a regular Form class you can define custom media to be used on
+# the ModelForm.
+
+>>> class ModelFormWithMedia(ModelForm):
+...     class Media:
+...         js = ('/some/form/javascript',)
+...         css = {
+...             'all': ('/some/form/css',)
+...         }
+...     class Meta:
+...         model = PhoneNumber
+>>> f = ModelFormWithMedia()
+>>> print f.media
+<link href="/some/form/css" type="text/css" media="all" rel="stylesheet" />
+<script type="text/javascript" src="/some/form/javascript"></script>
+
-"""}