Ticket #7483: delete_related.diff

django/contrib/admin/util.py

@@ -19 +19 @@
-        return # Avoid recursing too deep.
-    opts_seen = []
-    for related in opts.get_all_related_objects():
-__class__
+model
-        if related.opts in opts_seen:
-            continue
-        opts_seen.append(related.opts)
@@ -68 +68 @@
-                if not user.has_perm(p):
-                    perms_needed.add(related.opts.verbose_name)
-    for related in opts.get_all_related_many_to_many_objects():
-__class__
+model
-        if related.opts in opts_seen:
-            continue
-        opts_seen.append(related.opts)

tests/regressiontests/admin_views/fixtures/admin-views-users.xml

@@ -70 +70 @@
-        <field to="auth.group" name="groups" rel="ManyToManyRel"></field>
-        <field to="auth.permission" name="user_permissions" rel="ManyToManyRel"></field>
-    </object>
+    <object pk="1" model="admin_views.section">
+        <field type="CharField" name="name">Test section</field>
+    </object>
-    <object pk="1" model="admin_views.article">
-        <field type="TextField" name="content">&lt;p&gt;test content&lt;/p&gt;</field>
-        <field type="DateTimeField" name="date">2008-03-18 11:54:58</field>
+        <field to="admin_views.section" name="section" rel="ManyToOneRel">1</field>
-    </object>
-</django-objects>

tests/regressiontests/admin_views/tests.py

@@ -5 +5 @@
-from django.contrib.admin.sites import LOGIN_FORM_KEY, _encode_post_data
-
-# local test models
-
+, Section
-
-def get_perm(Model, perm):
-    """Return the permission object, for the Model"""
@@ -40 +40 @@
-        delete_user = User.objects.get(username='deleteuser')
-        delete_user.user_permissions.add(get_perm(Article,
-            opts.get_delete_permission()))
+
+        delete_user.user_permissions.add(get_perm(Section,
+            Section._meta.get_delete_permission()))
-        
-        # login POST dicts
-        self.super_login = {'post_data': _encode_post_data({}),
@@ -116 +119 @@
-        """Test add view restricts access and actually adds items."""
-        
-        add_dict = {'content': '<p>great article</p>',
-
+
+
-        
-        # Change User should not have access to add articles
-        self.client.get('/test_admin/admin/')
@@ -158 +162 @@
-        """Change view should restrict access and allow users to edit items."""
-        
-        change_dict = {'content': '<p>edited article</p>',
-
+
+
-        
-        # add user shoud not be able to view the list of article or change any of them
-        self.client.get('/test_admin/admin/')
@@ -270 +275 @@
-        # Delete user can delete
-        self.client.get('/test_admin/admin/')
-        self.client.post('/test_admin/admin/', self.deleteuser_login)
-
-
+
+
+
+
+
+
-        post = self.client.post('/test_admin/admin/admin_views/article/1/delete/', delete_dict)
-        # TODO: http://code.djangoproject.com/ticket/6819 or the next line fails
-        self.assertRedirects(post, '/test_admin/admin/')

tests/regressiontests/admin_views/models.py

@@ -1 +1 @@
-from django.db import models
-from django.contrib import admin
-
+class Section(models.Model):
+    """
+    A simple section that links to articles, to test linking to related items in
+    admin views.
+    """
+    name = models.CharField(max_length=100)
+
-class Article(models.Model):
-    """
-    A simple article to test admin views. Test backwards compabilty.
-    """
-    content = models.TextField()
-    date = models.DateTimeField()
+    section = models.ForeignKey(Section)
-
-class ArticleAdmin(admin.ModelAdmin):
-    list_display = ('content', 'date')
@@ -39 +47 @@
-        
-admin.site.register(Article, ArticleAdmin)
-admin.site.register(CustomArticle, CustomArticleAdmin)
+admin.site.register(Section)