Fixed merge conflicts from development

pages/migrations/0041_auto_20210506_1329.py

@@ -5,6 +5,7 @@
 import wagtail.fields
 
 
+
 class Migration(migrations.Migration):
 
     dependencies = [

pages/tests.py

@@ -39,6 +39,7 @@
                           AllyLogos,
                           K12MainPage,
                           Assignable, ImpactStory)
+
 from news.models import NewsIndex, PressIndex
 from books.models import BookIndex
 from shared.test_utilities import assertPathDoesNotRedirectToTrailingSlash, mock_user_login

salesforce/tests.py

@@ -26,6 +26,7 @@
 from wagtail.models import Page
 from wagtail.documents.models import Document
 
+
 from shared.test_utilities import mock_user_login
 
 

shared/tests.py

@@ -1,5 +1,9 @@
 from django.test import TestCase
 from shared.test_utilities import mock_user_login, RequestMock
+<<<<<<< HEAD
+=======
+
+>>>>>>> 8e0972ecb0cb613b6bf9a96425fc017e5fe918e7
 from unittest.mock import MagicMock
 
 class TestMockUserLogin(TestCase):

snippets/models.py

@@ -476,3 +476,4 @@ def __str__(self):
 
 
 register_snippet(AmazonBookBlurb)
+

snippets/serializers.py

@@ -1,6 +1,7 @@
 from .models import Role, Subject, K12Subject, ErrataContent, SubjectCategory, GiveBanner, BlogContentType, \
     BlogCollection, NoWebinarMessage, WebinarCollection, AssignableAvailable, AmazonBookBlurb
 
+
 from rest_framework import serializers, generics
 
 
@@ -141,3 +142,4 @@ class Meta:
         fields = ('amazon_book_blurb',)
         read_only_fields = ('amazon_book_blurb',)
 
+

snippets/signals.py

@@ -6,6 +6,7 @@
     WebinarCollection, AssignableAvailable, AmazonBookBlurb
 
 
+
 @receiver(post_save, sender=Subject)
 def clear_cloudfront_on_subject_save(sender, **kwargs):
     invalidate_cloudfront_caches('snippets/subjects')
@@ -54,3 +55,4 @@ def clear_cloudfront_on_assignable_available_save(sender, **kwargs):
 @receiver(post_save, sender=AmazonBookBlurb)
 def clear_cloudfront_on_amazon_book_blurb_save(sender, **kwargs):
     invalidate_cloudfront_caches('snippets/amazonbookblurb')
+

snippets/tests.py

@@ -9,6 +9,7 @@
 from snippets.models import Subject, ErrataContent, GiveBanner, BlogContentType, NoWebinarMessage, K12Subject, \
     FacultyResource, StudentResource, Role, SharedContent, NewsSource, SubjectCategory, BlogCollection, \
     AssignableAvailable, AmazonBookBlurb
+
 import snippets
 
 
@@ -75,6 +76,7 @@ def setUp(self):
             amazon_book_blurb="Amazon Book Blurb. Amazon Book Blurb. Amazon Book Blurb.")
         self.amazon_book_blurb.save()
 
+
     def test_can_create_subject(self):
         subject = Subject(name="Science", page_content="Science page content.", seo_title="Science SEO Title",
                             search_description="Science page description.")

snippets/urls.py

@@ -14,4 +14,5 @@
 router.register('webinarcollection', views.WebinarCollectionViewSet, basename="WebinarCollection")
 router.register('assignableavailable', views.AssignableAvailableViewSet, basename="AssignableAvailable")
 router.register('amazonbookblurb', views.AmazonBookBlurbViewSet, basename="AmazonBookBlurb")
+
 urlpatterns = router.urls

snippets/views.py

@@ -7,6 +7,7 @@
     GiveBannerSerializer, BlogContentTypeSerializer, BlogCollectionSerializer, NoWebinarMessageSerializer, \
     WebinarCollectionSerializer, AssignableAvailableSerializer, AmazonBookBlurbSerializer
 
+
 from rest_framework import generics, viewsets
 from django_filters.rest_framework import DjangoFilterBackend
 

wagtailimportexport/exporting.py

@@ -79,7 +79,7 @@ def export_page(settings={'root_page': None, 'export_unpublished': False,
             if settings['null_fk']:
                 functions.null_fks(page, data)
 
-            # Remove the owner of the page.
+            #Remove the owner of the page.
             if settings['null_users'] and not data.get('owner'):
                 data['owner'] = None
 

wagtailimportexport/functions.py

@@ -242,4 +242,5 @@ def content_type_by_model(model):
     if not content_type:
         return None
     else:
-        return str(content_type[0].pk)
+        return str(content_type[0].pk)
+

wagtailimportexport/importing.py

@@ -308,4 +308,5 @@ def update_page_references(model, pages_by_original_id):
             # rather than updating an existing one
             child.pk = None
             # update page references on the child model, including the ParentalKey
-            update_page_references(child, pages_by_original_id)
+            update_page_references(child, pages_by_original_id)
+