Commit 01c39262 authored by Julien Phalip's avatar Julien Phalip
Browse files

Fixed #10057 -- Ensured that the 'show_delete' context variable in the admin's... 

Fixed #10057 -- Ensured that the 'show_delete' context variable in the admin's change view actually controls the display of the delete button. Thanks to rajeesh for the report, to patcoll for the patch, and to David Gouldin for the test.
parent ea667ee3

django/contrib/admin/options.py

+0 −1
Original line number Diff line number Diff line
@@ -998,7 +998,6 @@ class ModelAdmin(BaseModelAdmin): 
            'title': _('Add %s') % force_unicode(opts.verbose_name),

            'adminform': adminForm,

            'is_popup': "_popup" in request.REQUEST,

            'show_delete': False,

            'media': media,

            'inline_admin_formsets': inline_admin_formsets,

            'errors': helpers.AdminErrorList(form, formsets),

django/contrib/admin/templatetags/admin_modify.py

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ def submit_row(context): 
        'onclick_attrib': (opts.get_ordered_objects() and change

                            and 'onclick="submitOrderForm();"' or ''),

        'show_delete_link': (not is_popup and context['has_delete_permission']

                              and (change or context['show_delete'])),

                              and change and context.get('show_delete', True)),

        'show_save_as_new': not is_popup and change and save_as,

        'show_save_and_add_another': context['has_add_permission'] and

                            not is_popup and (not save_as or context['add']),

tests/regressiontests/admin_views/admin.py

+7 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ from .models import (Article, Chapter, Account, Media, Child, Parent, Picture, 
    Album, Question, Answer, ComplexSortedPerson, PrePopulatedPostLargeSlug,

    AdminOrderedField, AdminOrderedModelMethod, AdminOrderedAdminMethod,

    AdminOrderedCallable, Report, Color2, UnorderedObject, MainPrepopulated,

    RelatedPrepopulated)

    RelatedPrepopulated, UndeletableObject)





def callable_year(dt_value):
@@ -569,6 +569,11 @@ class UnorderedObjectAdmin(admin.ModelAdmin): 
    list_per_page = 2





class UndeletableObjectAdmin(admin.ModelAdmin):

    def change_view(self, *args, **kwargs):

        kwargs['extra_context'] = {'show_delete': False}

        return super(UndeletableObjectAdmin, self).change_view(*args, **kwargs)





site = admin.AdminSite(name="admin")

site.register(Article, ArticleAdmin)
@@ -616,6 +621,7 @@ site.register(OtherStory, OtherStoryAdmin) 
site.register(Report, ReportAdmin)

site.register(MainPrepopulated, MainPrepopulatedAdmin)

site.register(UnorderedObject, UnorderedObjectAdmin)

site.register(UndeletableObject, UndeletableObjectAdmin)



# We intentionally register Promo and ChapterXtra1 but not Chapter nor ChapterXtra2.

# That way we cover all four cases:

tests/regressiontests/admin_views/customadmin.py

+1 −0
Original line number Diff line number Diff line
@@ -48,3 +48,4 @@ site.register(models.Thing, base_admin.ThingAdmin) 
site.register(models.Fabric, base_admin.FabricAdmin)

site.register(models.ChapterXtra1, base_admin.ChapterXtra1Admin)

site.register(User, UserLimitedAdmin)

site.register(models.UndeletableObject, base_admin.UndeletableObjectAdmin)

tests/regressiontests/admin_views/models.py

+7 −0
Original line number Diff line number Diff line
@@ -611,3 +611,10 @@ class UnorderedObject(models.Model): 
    """

    name = models.CharField(max_length=255)

    bool = models.BooleanField(default=True)



class UndeletableObject(models.Model):

    """

    Model whose show_delete in admin change_view has been disabled

    Refs #10057.

    """

    name = models.CharField(max_length=255)