Changeset 8764

Timestamp:

08/31/08 12:20:43 (4 months ago)

Author:

brosner

Message:

Fixed #8058 -- Moved media for filter_vertical/filter_horizontal widget to the widget for use outside the admin. This also corrects RelatedFieldWidgetWrapper? to expose the media of the wrapped widget. Thanks Erwin for the report and cgrady and ramikassab for the complete patch.

Files:

• django/trunk/django/contrib/admin/options.py (modified) (1 diff)
• django/trunk/django/contrib/admin/widgets.py (modified) (2 diffs)

django/trunk/django/contrib/admin/options.py

@@ -204 +204 @@
-        if self.opts.get_ordered_objects():
-            js.extend(['js/getElementsBySelector.js', 'js/dom-drag.js' , 'js/admin/ordering.js'])
-        if self.filter_vertical or self.filter_horizontal:
-            js.extend(['js/SelectBox.js' , 'js/SelectFilter2.js'])
-
-        return forms.Media(js=['%s%s' % (settings.ADMIN_MEDIA_PREFIX, url) for url in js])

django/trunk/django/contrib/admin/widgets.py

@@ -18 +18 @@
-    A SelectMultiple with a JavaScript filter interface.
-
-
-
-
+
+
+
+
+
+
+
+
-    def __init__(self, verbose_name, is_stacked, attrs=None, choices=()):
-        self.verbose_name = verbose_name
@@ -183 +188 @@
-        return obj
-
+    def _media(self):
+        return self.widget.media
+    media = property(_media)
+
-    def render(self, name, value, *args, **kwargs):
-        rel_to = self.rel.to