Changeset 8846

Timestamp:

09/02/08 01:10:14 (4 months ago)

Author:

brosner

Message:

Fixed #8787 -- Fixed failing admin_widgets tests. This fixes ManyToManyRawIdWidget? which was broken with [8823]. Thanks Alex Gaynor.

Files:

• django/trunk/django/contrib/admin/widgets.py (modified) (3 diffs)
• django/trunk/tests/regressiontests/admin_widgets/models.py (modified) (2 diffs)

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

@@ -106 +106 @@
-
-    def render(self, name, value, attrs=None):
-        from django.contrib.admin.views.main import TO_FIELD_VAR
-        related_url = '../../../%s/%s/' % (self.rel.to._meta.app_label, self.rel.to._meta.object_name.lower())
-{}
-self.rel.limit_choices_to
-params.update(dict([(k, ','.join(v)) for k, v in self.rel.limit_choices_to.items()])
-params.update({TO_FIELD_VAR: self.rel.get_related_field().name})
-url = '?' + '&'.join(['%s=%s' % (k, v) for k, v in params.items()])
+self.url_parameters()
+params
+url = '?' + '&'.join(['%s=%s' % (k, v) for k, v in params.items()]
+else:
+    url = ''
-        if not attrs.has_key('class'):
-          attrs['class'] = 'vForeignKeyRawIdAdminField' # The JavaScript looks for this hook.
@@ -124 +123 @@
-            output.append(self.label_for_value(value))
-        return mark_safe(u''.join(output))
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def label_for_value(self, value):
-        key = self.rel.get_related_field().name
@@ -145 +156 @@
-            value = ''
-        return super(ManyToManyRawIdWidget, self).render(name, value, attrs)
-
+
+
+
+
-    def label_for_value(self, value):
-        return ''

django/trunk/tests/regressiontests/admin_widgets/models.py

@@ -70 +70 @@
->>> w = ForeignKeyRawIdWidget(rel)
->>> print conditional_escape(w.render('test', band.pk, attrs={}))
-
+?t=id
-
->>> m1 = Member.objects.create(pk=1, name='Chester')
@@ -101 +101 @@
->>> w = ForeignKeyRawIdWidget(rel)
->>> print w.render('test', core.parent_id, attrs={})
-" class="related-lookup" id="lookup_id_test" onclick="return showRelatedObjectLookupPopup(this);"> <img src="/admin_media/
+?t=barcode" class="related-lookup" id="lookup_id_test" onclick="return showRelatedObjectLookupPopup(this);"> <img src="%(ADMIN_MEDIA_PREFIX)s
-""" % {
-    'ADMIN_MEDIA_PREFIX': settings.ADMIN_MEDIA_PREFIX,