Commit c80d85d4 authored by Tim Graham's avatar Tim Graham
Browse files

[1.9.x] Fixed #25903 -- Fixed the admin's list_editable add/change buttons. 

Backport of f18b0874 from master
parent 40fd2174

django/contrib/admin/options.py

+1 −1
Original line number Diff line number Diff line
@@ -566,9 +566,9 @@ class ModelAdmin(BaseModelAdmin): 
        extra = '' if settings.DEBUG else '.min'

        js = [

            'core.js',

            'admin/RelatedObjectLookups.js',

            'vendor/jquery/jquery%s.js' % extra,

            'jquery.init.js',

            'admin/RelatedObjectLookups.js',

            'actions%s.js' % extra,

            'urlify.js',

            'prepopulate%s.js' % extra,

django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js

+23 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
// Handles related-objects functionality: lookup link for raw_id_fields

// and Add Another links.



(function() {

(function($) {

    'use strict';



    function html_unescape(text) {
@@ -157,4 +157,25 @@ 
    window.showAddAnotherPopup = showRelatedObjectPopup;

    window.dismissAddAnotherPopup = dismissAddRelatedObjectPopup;



})();
 
    $(document).ready(function() {

        $('body').on('click', '.related-widget-wrapper-link', function(e) {

            e.preventDefault();

            if (this.href) {

                var event = $.Event('django:show-related', {href: this.href});

                $(this).trigger(event);

                if (!event.isDefaultPrevented()) {

                    showRelatedObjectPopup(this);

                }

            }

        });

        $('body').on('change', '.related-widget-wrapper select', function(e) {

            var event = $.Event('django:update-related');

            $(this).trigger(event);

            if (!event.isDefaultPrevented()) {

                updateRelatedObjectLinks(this);

            }

        });

        $('.related-widget-wrapper select').trigger('change');

    });



})(django.jQuery);

django/contrib/admin/templates/admin/change_form.html

+0 −18
Original line number Diff line number Diff line
@@ -87,24 +87,6 @@ 
                        showRelatedObjectLookupPopup(this);

                    }

                });

                $('body').on('click', '.related-widget-wrapper-link', function(e) {

                    e.preventDefault();

                    if (this.href) {

                        var event = $.Event('django:show-related', {href: this.href});

                        $(this).trigger(event);

                        if (!event.isDefaultPrevented()) {

                            showRelatedObjectPopup(this);

                        }

                    }

                });

                $('body').on('change', '.related-widget-wrapper select', function(e) {

                    var event = $.Event('django:update-related');

                    $(this).trigger(event);

                    if (!event.isDefaultPrevented()) {

                        updateRelatedObjectLinks(this);

                    }

                });

                $('.related-widget-wrapper select').trigger('change');



            {% if adminform and add %}

                $('form#{{ opts.model_name }}_form :input:visible:enabled:first').focus()

docs/releases/1.9.1.txt

+3 −0
Original line number Diff line number Diff line
@@ -61,3 +61,6 @@ Bugfixes 


* Fixed ``migrate --fake-initial`` detection of many-to-many tables

  (:ticket:`25922`).



* Restored the functionality of the admin's ``list_editable`` add and change

  buttons (:ticket:`25903`).

tests/admin_views/admin.py

+5 −2
Original line number Diff line number Diff line
@@ -87,8 +87,11 @@ class ChapterXtra1Admin(admin.ModelAdmin): 




class ArticleAdmin(admin.ModelAdmin):

    list_display = ('content', 'date', callable_year, 'model_year',

                    'modeladmin_year', 'model_year_reversed')

    list_display = (

        'content', 'date', callable_year, 'model_year', 'modeladmin_year',

        'model_year_reversed', 'section',

    )

    list_editable = ('section',)

    list_filter = ('date', 'section')

    view_on_site = False

    fieldsets = (