Commit b649f686 authored by Y3K's avatar Y3K Committed by Tim Graham
Browse files

Fixed #25262 -- Removed the enable_comments field from FlatPageAdmin.

parent e7588233

django/contrib/flatpages/admin.py

+5 −3
Original line number Diff line number Diff line
@@ -8,11 +8,13 @@ class FlatPageAdmin(admin.ModelAdmin): 
    form = FlatpageForm

    fieldsets = (

        (None, {'fields': ('url', 'title', 'content', 'sites')}),

        (_('Advanced options'), {'classes': ('collapse',),

        'fields': ('enable_comments', 'registration_required', 'template_name')}),

        (_('Advanced options'), {

            'classes': ('collapse',),

            'fields': ('registration_required', 'template_name'),

        }),

    )

    list_display = ('url', 'title')

    list_filter = ('sites', 'enable_comments', 'registration_required')

    list_filter = ('sites', 'registration_required')

    search_fields = ('url', 'title')



admin.site.register(FlatPage, FlatPageAdmin)

docs/ref/contrib/admin/index.txt

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ subclass:: 
                }),

                ('Advanced options', {

                    'classes': ('collapse',),

                    'fields': ('enable_comments', 'registration_required', 'template_name')

                    'fields': ('registration_required', 'template_name'),

                }),

            )

docs/ref/contrib/flatpages.txt

+34 −0
Original line number Diff line number Diff line
@@ -170,6 +170,8 @@ For more on middleware, read the :doc:`middleware docs 
How to add, change and delete flatpages

=======================================



.. _flatpages-admin:



Via the admin interface

-----------------------
@@ -177,6 +179,38 @@ If you've activated the automatic Django admin interface, you should see a 
"Flatpages" section on the admin index page. Edit flatpages as you edit any

other object in the system.



The ``FlatPage`` model has an ``enable_comments`` field that isn't used by

``contrib.flatpages``, but that could be useful for your project or third-party

apps. It doesn't appear in the admin interface, but you can add it by

registering a custom ``ModelAdmin`` for ``FlatPage``::



    from django.contrib import admin

    from django.contrib.flatpages.admin import FlatPageAdmin

    from django.contrib.flatpages.models import FlatPage

    from django.utils.translation import ugettext_lazy as _



    # Define a new FlatPageAdmin

    class FlatPageAdmin(FlatPageAdmin):

        fieldsets = (

            (None, {'fields': ('url', 'title', 'content', 'sites')}),

            (_('Advanced options'), {

                'classes': ('collapse', ),

                'fields': (

                    'enable_comments',

                    'registration_required',

                    'template_name',

                ),

            }),

        )



    # Re-register FlatPageAdmin

    admin.site.unregister(FlatPage)

    admin.site.register(FlatPage, FlatPageAdmin)



.. versionchanged:: 1.9



    The ``enable_comments`` field was removed from ``FlatPageAdmin``.



Via the Python API

------------------

docs/releases/1.9.txt

+4 −0
Original line number Diff line number Diff line
@@ -996,6 +996,10 @@ Miscellaneous 
  levels. Previously, messages of ``ERROR`` level or higher were printed to the

  console.



* The ``FlatPage.enable_comments`` field is removed from the ``FlatPageAdmin``

  as it's unused by the application. If your project or a third-party app makes

  use of it, :ref:`create a custom ModelAdmin <flatpages-admin>` to add it back.



.. _deprecated-features-1.9:



Features deprecated in 1.9