From 02daf67daf33ee1ff706b396f92d06b676217f6f Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 30 Jun 2014 14:32:18 +0100 Subject: [PATCH] Renamed 'page' argument of page_published signal to 'instance' This is to give more consistancy with djangos built in signals --- wagtail/wagtailadmin/tests/test_pages_views.py | 12 ++++++------ wagtail/wagtailadmin/views/pages.py | 6 +++--- wagtail/wagtailcore/signals.py | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py index 1bab3b137f..a26feee9c3 100644 --- a/wagtail/wagtailadmin/tests/test_pages_views.py +++ b/wagtail/wagtailadmin/tests/test_pages_views.py @@ -174,9 +174,9 @@ class TestPageCreation(TestCase, WagtailTestUtils): # Connect a mock signal handler to page_published signal signal_fired = [False] signal_page = [None] - def page_published_handler(sender, page, **kwargs): + def page_published_handler(sender, instance, **kwargs): signal_fired[0] = True - signal_page[0] = page + signal_page[0] = instance page_published.connect(page_published_handler) # Post @@ -345,9 +345,9 @@ class TestPageEdit(TestCase, WagtailTestUtils): # Connect a mock signal handler to page_published signal signal_fired = [False] signal_page = [None] - def page_published_handler(sender, page, **kwargs): + def page_published_handler(sender, instance, **kwargs): signal_fired[0] = True - signal_page[0] = page + signal_page[0] = instance page_published.connect(page_published_handler) # Tests publish from edit page @@ -672,9 +672,9 @@ class TestApproveRejectModeration(TestCase, WagtailTestUtils): # Connect a mock signal handler to page_published signal signal_fired = [False] signal_page = [None] - def page_published_handler(sender, page, **kwargs): + def page_published_handler(sender, instance, **kwargs): signal_fired[0] = True - signal_page[0] = page + signal_page[0] = instance page_published.connect(page_published_handler) # Post diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index f829df9c51..3f41bbc2b7 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -159,7 +159,7 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_ page.save_revision(user=request.user, submitted_for_moderation=is_submitting) if is_publishing: - page_published.send(sender=page_class, page=page) + page_published.send(sender=page_class, instance=page) messages.success(request, _("Page '{0}' published.").format(page.title)) elif is_submitting: messages.success(request, _("Page '{0}' submitted for moderation.").format(page.title)) @@ -240,7 +240,7 @@ def edit(request, page_id): page.save_revision(user=request.user, submitted_for_moderation=is_submitting) if is_publishing: - page_published.send(sender=page.__class__, page=page) + page_published.send(sender=page.__class__, instance=page) messages.success(request, _("Page '{0}' published.").format(page.title)) elif is_submitting: messages.success(request, _("Page '{0}' submitted for moderation.").format(page.title)) @@ -609,7 +609,7 @@ def approve_moderation(request, revision_id): if request.POST: revision.publish() - page_published.send(sender=revision.page.__class__, page=revision.page.specific) + page_published.send(sender=revision.page.__class__, instance=revision.page.specific) messages.success(request, _("Page '{0}' published.").format(revision.page.title)) tasks.send_notification.delay(revision.id, 'approved', request.user.id) diff --git a/wagtail/wagtailcore/signals.py b/wagtail/wagtailcore/signals.py index 38a0809c83..2508759c6e 100644 --- a/wagtail/wagtailcore/signals.py +++ b/wagtail/wagtailcore/signals.py @@ -1,4 +1,4 @@ from django.dispatch import Signal -page_published = Signal(providing_args=['page']) +page_published = Signal(providing_args=['instance'])