Changeset 6325

Timestamp:

09/15/07 15:01:25 (1 year ago)

Author:

jkocherhans

Message:

newforms-admin: Removed dependency on _meta.admin in get_deleted_objects.

Files:

• django/branches/newforms-admin/django/contrib/admin/options.py (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/admin/util.py (modified) (8 diffs)

django/branches/newforms-admin/django/contrib/admin/options.py

@@ -628 +628 @@
-        deleted_objects = [u'%s: <a href="../../%s/">%s</a>' % (force_unicode(capfirst(opts.verbose_name)), object_id, escape(str(obj))), []]
-        perms_needed = sets.Set()
-
+, self.admin_site
-
-        if request.POST: # The user has already confirmed the deletion.

django/branches/newforms-admin/django/contrib/admin/util.py

@@ -11 +11 @@
-    current.append(val)
-
-
+, admin_site
-    "Helper function that recursively populates deleted_objects."
-    nh = _nest_help # Bind to local variable for performance
@@ -18 +18 @@
-    opts_seen = []
-    for related in opts.get_all_related_objects():
+        has_admin = related.__class__ in admin_site._registry
-        if related.opts in opts_seen:
-            continue
@@ -28 +29 @@
-                pass
-            else:
-related.opts.
+has_
-                    p = '%s.%s' % (related.opts.app_label, related.opts.get_delete_permission())
-                    if not user.has_perm(p):
@@ -34 +35 @@
-                        # We don't care about populating deleted_objects now.
-                        continue
-related.opts.
+has_
-                    # Don't display link to edit, because it either has no
-                    # admin or is edited inline.
@@ -43 +44 @@
-                        (force_unicode(capfirst(related.opts.verbose_name)), related.opts.app_label, related.opts.object_name.lower(),
-                        sub_obj._get_pk_val(), sub_obj), []])
-
+, admin_site
-        else:
-            has_related_objs = False
-            for sub_obj in getattr(obj, rel_opts_name).all():
-                has_related_objs = True
-related.opts.
+has_
-                    # Don't display link to edit, because it either has no
-                    # admin or is edited inline.
@@ -56 +57 @@
-                    nh(deleted_objects, current_depth, [u'%s: <a href="../../../../%s/%s/%s/">%s</a>' % \
-                        (force_unicode(capfirst(related.opts.verbose_name)), related.opts.app_label, related.opts.object_name.lower(), sub_obj._get_pk_val(), escape(sub_obj)), []])
-
+, admin_site
-            # If there were related objects, and the user doesn't have
-            # permission to delete them, add the missing perm to perms_needed.
-related.opts.
+has_
-                p = '%s.%s' % (related.opts.app_label, related.opts.get_delete_permission())
-                if not user.has_perm(p):
-                    perms_needed.add(related.opts.verbose_name)
-    for related in opts.get_all_related_many_to_many_objects():
+        has_admin = related.__class__ in admin_site._registry
-        if related.opts in opts_seen:
-            continue
@@ -78 +80 @@
-        if has_related_objs:
-            for sub_obj in rel_objs.all():
-related.opts.
+has_
-                    # Don't display link to edit, because it either has no
-                    # admin or is edited inline.
@@ -91 +93 @@
-        # If there were related objects, and the user doesn't have
-        # permission to change them, add the missing perm to perms_needed.
-related.opts.
+has_
-            p = u'%s.%s' % (related.opts.app_label, related.opts.get_change_permission())
-            if not user.has_perm(p):