From 6ccd665e5e3b102e802746b9d15b61332fdd5074 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 16 May 2018 11:44:14 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"Issue=204334:=20Excluded=20fields=20a?= =?UTF-8?q?re=20also=20excluded=20when=20a=20panel=20set=20is=20exp?= =?UTF-8?q?=E2=80=A6=20(#4363)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6b272c43e4b81e08346ac9ee6a688654d44d4b76. Conflicts: wagtail/admin/tests/test_edit_handlers.py --- wagtail/admin/edit_handlers.py | 11 +---------- wagtail/admin/tests/test_edit_handlers.py | 5 ----- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/wagtail/admin/edit_handlers.py b/wagtail/admin/edit_handlers.py index b152ed193..e1f3ea2f0 100644 --- a/wagtail/admin/edit_handlers.py +++ b/wagtail/admin/edit_handlers.py @@ -64,16 +64,7 @@ def get_form_for_model( def extract_panel_definitions_from_model_class(model, exclude=None): if hasattr(model, 'panels'): - panels = model.panels - - if exclude is not None: - # Filter out fields in exclude - panels = [ - panel for panel in panels - if isinstance(panel, FieldPanel) and panel.field_name not in exclude - ] - - return panels + return model.panels panels = [] diff --git a/wagtail/admin/tests/test_edit_handlers.py b/wagtail/admin/tests/test_edit_handlers.py index f637669c9..6b47dee36 100644 --- a/wagtail/admin/tests/test_edit_handlers.py +++ b/wagtail/admin/tests/test_edit_handlers.py @@ -209,11 +209,6 @@ class TestExtractPanelDefinitionsFromModelClass(TestCase): for panel in panels: self.assertNotEqual(panel.field_name, 'hostname') - def test_exclude_with_defined_panels(self): - Site.panels = [FieldPanel('hostname')] - panels = extract_panel_definitions_from_model_class(Site, exclude=['hostname']) - self.assertEqual([], panels) - def test_can_build_panel_list(self): # EventPage has no 'panels' definition, so one should be derived from the field list panels = extract_panel_definitions_from_model_class(EventPage)