Django 2.0 compatibility fixes

bakerydemo/base/models.py

@@ -336,7 +336,7 @@ class FormField(AbstractFormField):
     can read more about Wagtail forms at:
     http://docs.wagtail.io/en/latest/reference/contrib/forms/index.html
     """
-    page = ParentalKey('FormPage', related_name='form_fields')
+    page = ParentalKey('FormPage', related_name='form_fields', on_delete=models.CASCADE)
 
 
 class FormPage(AbstractEmailForm):

bakerydemo/base/templatetags/navigation_tags.py

@@ -9,7 +9,7 @@ register = template.Library()
 # https://docs.djangoproject.com/en/1.9/howto/custom-template-tags/
 
 
-@register.assignment_tag(takes_context=True)
+@register.simple_tag(takes_context=True)
 def get_site_root(context):
     # This returns a core.Page. The main menu needs to have the site.root_page
     # defined else will return an object attribute error ('str' object has no

bakerydemo/blog/models.py

@@ -29,10 +29,10 @@ class BlogPeopleRelationship(Orderable, models.Model):
     the ParentalKey and ForeignKey
     """
     page = ParentalKey(
-        'BlogPage', related_name='blog_person_relationship'
+        'BlogPage', related_name='blog_person_relationship', on_delete=models.CASCADE
     )
     people = models.ForeignKey(
-        'base.People', related_name='person_blog_relationship'
+        'base.People', related_name='person_blog_relationship', on_delete=models.CASCADE
     )
     panels = [
         SnippetChooserPanel('people')
@@ -45,7 +45,7 @@ class BlogPageTag(TaggedItemBase):
     the BlogPage object and tags. There's a longer guide on using it at
     http://docs.wagtail.io/en/latest/reference/pages/model_recipes.html#tagging
     """
-    content_object = ParentalKey('BlogPage', related_name='tagged_items')
+    content_object = ParentalKey('BlogPage', related_name='tagged_items', on_delete=models.CASCADE)
 
 
 class BlogPage(Page):

bakerydemo/locations/models.py

@@ -78,7 +78,8 @@ class LocationOperatingHours(Orderable, OperatingHours):
     """
     location = ParentalKey(
         'LocationPage',
-        related_name='hours_of_operation'
+        related_name='hours_of_operation',
+        on_delete=models.CASCADE
     )
 
 

bakerydemo/urls.py

@@ -9,7 +9,7 @@ from wagtail.wagtailcore import urls as wagtail_urls
 from bakerydemo.search import views as search_views
 
 urlpatterns = [
-    url(r'^django-admin/', include(admin.site.urls)),
+    url(r'^django-admin/', admin.site.urls),
 
     url(r'^admin/', include(wagtailadmin_urls)),
     url(r'^documents/', include(wagtaildocs_urls)),