Changeset 2554

Timestamp:

03/24/06 10:13:57 (3 years ago)

Author:

jacob

Message:

magic-removal: made a few tweaks to admin documentation views to better handle
new-style relation descriptors and deal with non-named groups in urlpatterns.

Files:

• django/branches/magic-removal/django/contrib/admin/utils.py (modified) (2 diffs)
• django/branches/magic-removal/django/contrib/admin/views/doc.py (modified) (5 diffs)

django/branches/magic-removal/django/contrib/admin/utils.py

@@ -83 +83 @@
-def create_reference_role(rolename, urlbase):
-    def _role(name, rawtext, text, lineno, inliner, options={}, content=[]):
-
+.lower()
-        return [node], []
-    docutils.parsers.rst.roles.register_canonical_role(rolename, _role)
@@ -89 +89 @@
-def default_reference_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
-    context = inliner.document.settings.default_reference_context
-
+.lower()
-    return [node], []
-

django/branches/magic-removal/django/contrib/admin/views/doc.py

@@ -94 +94 @@
-        return missing_docutils_page(request)
-
-
-
-
+
+
+
+
+
+
+
-        urlconf = __import__(settings_mod.ROOT_URLCONF, '', '', [''])
-        view_functions = extract_views_from_urlpatterns(urlconf.urlpatterns)
@@ -164 +168 @@
-    fields = []
-    for field in opts.fields:
+        # ForeignKey is a special case since the field will actually be a 
+        # descriptor that returns the other object 
+        if isinstance(field, models.ForeignKey):
+            data_type = related_object_name = field.rel.to.__name__
+            app_label = field.rel.to._meta.app_label
+            verbose = utils.parse_rst(("the related `%s.%s` object"  % (app_label, data_type)), 'model', 'model:' + data_type) 
+        else:
+            data_type = get_readable_field_data_type(field)
+            verbose = field.verbose_name
-        fields.append({
-            'name': field.name,
-get_readable_field_data_type(field)
-field.verbose_nam
+data_type
+verbos
-            'help': field.help_text,
-        })
@@ -188 +201 @@
-                'verbose': verbose,
-            })
+            
+    # Gather related objects
+    for rel in opts.get_all_related_objects():
+        verbose = "related `%s.%s` objects" % (rel.opts.app_label, rel.opts.object_name)
+        accessor = rel.get_accessor_name()
+        fields.append({
+            'name' : "%s.all" % accessor,
+            'verbose' : utils.parse_rst("all " + verbose , 'model', 'model:' + opts.module_name),
+        })
+        fields.append({
+            'name' : "%s.count" % accessor,
+            'verbose' : utils.parse_rst("number of " + verbose , 'model', 'model:' + opts.module_name),
+        })
-
-    return render_to_response('admin_doc/model_detail', {
@@ -278 +304 @@
-
-def get_readable_field_data_type(field):
-    # ForeignKey is a special case. Use the field type of the relation.
-    if field.get_internal_type() == 'ForeignKey':
-        field = field.rel.get_related_field()
-    return DATA_TYPE_MAPPING[field.get_internal_type()] % field.__dict__
-
@@ -302 +325 @@
-    return views
-
-# Clean up urlpattern regexes into something somewhat readable by Mere Humans:
-# turns something like "^(?P<sport_slug>\w+)/athletes/(?P<athlete_slug>\w+)/$"
-# into "<sport_slug>/athletes/<athlete_slug>/"
-
-named_group_matcher = re.compile(r'\(\?P(<\w+>).+?\)')
+non_named_group_matcher = re.compile(r'\(.*?\)')
-
-def simplify_regex(pattern):
+    """
+    Clean up urlpattern regexes into something somewhat readable by Mere Humans:
+    turns something like "^(?P<sport_slug>\w+)/athletes/(?P<athlete_slug>\w+)/$"
+    into "<sport_slug>/athletes/<athlete_slug>/"
+    """
+    # handle named groups first
-    pattern = named_group_matcher.sub(lambda m: m.group(1), pattern)
-
+
+
+
+
+
+
-    if not pattern.startswith('/'):
-        pattern = '/' + pattern