Changeset 3307

Timestamp:

07/09/06 23:16:26 (2 years ago)

Author:

adrian

Message:

Fixed #2301 -- Added list_display_links option to 'class Admin', which regulates which fields in the change list have links. Thanks, kilian

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/contrib/admin/templatetags/admin_list.py (modified) (1 diff)
• django/trunk/django/core/management.py (modified) (1 diff)
• django/trunk/django/db/models/options.py (modified) (2 diffs)
• django/trunk/docs/model-api.txt (modified) (1 diff)

django/trunk/AUTHORS

@@ -73 +73 @@
-    Russell Keith-Magee <freakboy@iinet.net.au>
-    Garth Kidd <http://www.deadlybloodyserious.com/>
+    kilian <kilian.cavalotti@lip6.fr>
-    Sune Kirkeby <http://ibofobi.dk/>
-    Cameron Knight (ckknight)

django/trunk/django/contrib/admin/templatetags/admin_list.py

@@ -166 +166 @@
-        if result_repr == '':
-            result_repr = ' '
-
+
+
-            first = False
-            url = cl.url_for_result(result)

django/trunk/django/core/management.py

@@ -937 +937 @@
-                            if isinstance(f, models.ManyToManyField):
-                                e.add(opts, '"admin.list_display" doesn\'t support ManyToManyFields (%r).' % fn)
+                # list_display_links
+                if opts.admin.list_display_links and not opts.admin.list_display:
+                    e.add(opts, '"admin.list_display" must be defined for "admin.list_display_links" to be used.')
+                if not isinstance(opts.admin.list_display_links, (list, tuple)):
+                    e.add(opts, '"admin.list_display_links", if given, must be set to a list or tuple.')
+                else:
+                    for fn in opts.admin.list_display_links:
+                        try:
+                            f = opts.get_field(fn)
+                        except models.FieldDoesNotExist:
+                            e.add(opts, '"admin.list_filter" refers to %r, which isn\'t a field.' % fn)
+                        if fn not in opts.admin.list_display:
+                            e.add(opts, '"admin.list_display_links" refers to %r, which is not defined in "admin.list_display".' % fn)
-                # list_filter
-                if not isinstance(opts.admin.list_filter, (list, tuple)):

django/trunk/django/db/models/options.py

@@ -200 +200 @@
-
-class AdminOptions(object):
-
+display_links=None, list_
-        date_hierarchy=None, save_as=False, ordering=None, search_fields=None,
-        save_on_top=False, list_select_related=False, manager=None, list_per_page=100):
@@ -206 +206 @@
-        self.js = js or []
-        self.list_display = list_display or ['__str__']
+        self.list_display_links = list_display_links or []
-        self.list_filter = list_filter or []
-        self.date_hierarchy = date_hierarchy

django/trunk/docs/model-api.txt

@@ -1225 +1225 @@
-                  return self.birthday.strftime('%Y')[:3] + "0's"
-              decade_born_in.short_description = 'Birth decade'
+
+``list_display_links``
+----------------------
+
+Set ``list_display_links`` to control which fields in ``list_display`` should
+be linked to the "change" page for an object.
+
+By default, the change list page will link the first column -- the first field
+specified in ``list_display`` -- to the change page for each item. But
+``list_display_links`` lets you change which columns are linked. Set
+``list_display_links`` to a list or tuple of field names (in the same format as
+``list_display``) to link.
+
+``list_display_links`` can specify one or many field names. As long as the
+field names appear in ``list_display``, Django doesn't care how many (or how
+few) fields are linked. The only requirement is: If you want to use
+``list_display_links``, you must define ``list_display``.
+
+In this example, the ``first_name`` and ``last_name`` fields will be linked on
+the change list page::
+
+    class Admin:
+        list_display = ('first_name', 'last_name', 'birthday')
+        list_display_links = ('first_name', 'last_name')
+
+Finally, note that in order to use ``list_display_links``, you must define
+``list_display``, too.
-
-``list_filter``