From 34bd4bd974562ee35e6cf7cdc600c7a05dd022a1 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Tue, 10 Feb 2015 23:29:20 +0000 Subject: [PATCH 1/3] first pass at to_python and get_prep_value on PageChooserBlock --- wagtail/wagtailadmin/blocks.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/wagtail/wagtailadmin/blocks.py b/wagtail/wagtailadmin/blocks.py index fa2b779bc..f529b369d 100644 --- a/wagtail/wagtailadmin/blocks.py +++ b/wagtail/wagtailadmin/blocks.py @@ -356,6 +356,23 @@ class PageChooserBlock(FieldBlock): from wagtail.wagtailadmin.widgets import AdminPageChooser return ModelChoiceField(queryset=Page.objects.all(), widget=AdminPageChooser) + def to_python(self, value): + from wagtail.wagtailcore.models import Page + + if value is None or isinstance(value, Page): + return value + else: + try: + return Page.objects.get(pk=value) # TODO: use the specific class in place of Page where appropriate + except Page.DoesNotExist: + return None + + def get_prep_value(self, value): + if isinstance(value, Page): + return value.id + else: + return value + # ======= # Chooser # ======= From d11205454beae6bf436d09e01d544656d3bbb533 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 11 Feb 2015 01:21:24 +0000 Subject: [PATCH 2/3] fix PageChooserBlock to return a page object rather than an ID. AdminPageChooser has been tweaked to accept either an ID or an instance as its input value, and FieldBlock now passes the result of value_from_datadict through to_python to deal with the case where the widget doesn't return our expected type. --- wagtail/wagtailadmin/blocks.py | 7 ++++++- wagtail/wagtailadmin/widgets.py | 16 ++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/wagtail/wagtailadmin/blocks.py b/wagtail/wagtailadmin/blocks.py index f529b369d..c80f87bf0 100644 --- a/wagtail/wagtailadmin/blocks.py +++ b/wagtail/wagtailadmin/blocks.py @@ -330,7 +330,7 @@ class FieldBlock(Block): }) def value_from_datadict(self, data, files, prefix): - return self.field.widget.value_from_datadict(data, files, prefix) + return self.to_python(self.field.widget.value_from_datadict(data, files, prefix)) def clean(self, value): return self.field.clean(value) @@ -368,11 +368,16 @@ class PageChooserBlock(FieldBlock): return None def get_prep_value(self, value): + from wagtail.wagtailcore.models import Page if isinstance(value, Page): return value.id else: return value + def render_basic(self, value): + if value: + return format_html('{1}', value.url, value.title) + # ======= # Chooser # ======= diff --git a/wagtail/wagtailadmin/widgets.py b/wagtail/wagtailadmin/widgets.py index 946f5987e..2f445cc98 100644 --- a/wagtail/wagtailadmin/widgets.py +++ b/wagtail/wagtailadmin/widgets.py @@ -82,10 +82,14 @@ class AdminPageChooser(AdminChooser): self.target_content_type = content_type or ContentType.objects.get_for_model(Page) def render_html(self, name, value, attrs): - original_field_html = super(AdminPageChooser, self).render_html(name, value, attrs) - model_class = self.target_content_type.model_class() - instance = self.get_instance(model_class, value) + if isinstance(value, model_class): + instance = value + value = value.pk + else: + instance = self.get_instance(model_class, value) + + original_field_html = super(AdminPageChooser, self).render_html(name, value, attrs) return render_to_string("wagtailadmin/widgets/page_chooser.html", { 'widget': self, @@ -96,7 +100,11 @@ class AdminPageChooser(AdminChooser): }) def render_js_init(self, id_, name, value): - page = Page.objects.get(pk=value) if value else None + model_class = self.target_content_type.model_class() + if isinstance(value, model_class): + page = value + else: + page = self.get_instance(model_class, value) parent = page.get_parent() if page else None content_type = self.target_content_type From e01167ff1f3d7de995c770d67dd73b7aad8763f4 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 11 Feb 2015 10:34:11 +0000 Subject: [PATCH 3/3] pull re-usable methods of PageChooserBlock into an abstract superclass --- wagtail/wagtailadmin/blocks.py | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/wagtail/wagtailadmin/blocks.py b/wagtail/wagtailadmin/blocks.py index c80f87bf0..ec05e121b 100644 --- a/wagtail/wagtailadmin/blocks.py +++ b/wagtail/wagtailadmin/blocks.py @@ -349,31 +349,39 @@ class RichTextBlock(FieldBlock): def render_basic(self, value): return mark_safe('
' + expand_db_html(value) + '
') -class PageChooserBlock(FieldBlock): + +class ChooserBlock(FieldBlock): + """Abstract superclass for fields that implement a chooser interface (page, image, snippet etc)""" @cached_property def field(self): - from wagtail.wagtailcore.models import Page # TODO: allow limiting to specific page types - from wagtail.wagtailadmin.widgets import AdminPageChooser - return ModelChoiceField(queryset=Page.objects.all(), widget=AdminPageChooser) + return ModelChoiceField(queryset=self.target_model.objects.all(), widget=self.widget) def to_python(self, value): - from wagtail.wagtailcore.models import Page - - if value is None or isinstance(value, Page): + if value is None or isinstance(value, self.target_model): return value else: try: - return Page.objects.get(pk=value) # TODO: use the specific class in place of Page where appropriate - except Page.DoesNotExist: + return self.target_model.objects.get(pk=value) + except self.target_model.DoesNotExist: return None def get_prep_value(self, value): - from wagtail.wagtailcore.models import Page - if isinstance(value, Page): + if isinstance(value, self.target_model): return value.id else: return value +class PageChooserBlock(ChooserBlock): + @cached_property + def target_model(self): + from wagtail.wagtailcore.models import Page # TODO: allow limiting to specific page types + return Page + + @cached_property + def widget(self): + from wagtail.wagtailadmin.widgets import AdminPageChooser + return AdminPageChooser + def render_basic(self, value): if value: return format_html('{1}', value.url, value.title)