Changeset 1489

Timestamp:

11/28/05 23:54:56 (3 years ago)

Author:

adrian

Message:

Fixed #954 -- Many-to-many raw_id_admin change page now displays original object(s) correctly. Thanks for reporting, mordaha

Files:

• django/trunk/django/contrib/admin/views/main.py (modified) (3 diffs)

django/trunk/django/contrib/admin/views/main.py

@@ -277 +277 @@
-    return js
-
-
-class AdminBoundField(BoundField):
-    def __init__(self, field, field_mapping, original):
-field_mapping,
+ field_mapping, 
-
-        self.element_id = self.form_fields[0].get_id()
@@ -292 +291 @@
-
-        classes = []
-(self.raw_id_admin)
+ self.raw_id_admin
-            classes.append('nowrap')
-        if max([bool(f.errors()) for f in self.form_fields]):
@@ -306 +305 @@
-
-    def _fill_existing_display(self):
-self._display_filled
+getattr(self, '_display_filled', False)
-            return
-
+ 
-        if isinstance(self.field.rel, meta.ManyToOne):
-             func_name = 'get_%s' % self.field.name
-             self._display = self._fetch_existing_display(func_name)
-        elif isinstance(self.field.rel, meta.ManyToMany):
-name
-".join(self._fetch_existing_display(func_name)
+rel.singular
+ ".join([str(obj) for obj in self._fetch_existing_display(func_name)]
-        self._display_filled = True
-