Browse Source

Replace hard-coded Image model with get_image_model_string (#288)

pimarc 4 years ago
parent
commit
30acbcc18b

File diff suppressed because it is too large
+ 1 - 1
coderedcms/migrations/0001_initial.py


+ 5 - 4
coderedcms/models/page_models.py

@@ -54,6 +54,7 @@ from wagtail.contrib.forms.models import FormSubmission
 from wagtail.search import index
 from wagtail.utils.decorators import cached_classmethod
 from wagtailcache.cache import WagtailCacheMixin
+from wagtail.images import get_image_model_string
 
 from coderedcms import schema, utils
 from coderedcms.blocks import (
@@ -142,7 +143,7 @@ class CoderedPage(WagtailCacheMixin, Page, metaclass=CoderedPageMeta):
     ###############
 
     cover_image = models.ForeignKey(
-        'wagtailimages.Image',
+        get_image_model_string(),
         null=True,
         blank=True,
         on_delete=models.SET_NULL,
@@ -211,7 +212,7 @@ class CoderedPage(WagtailCacheMixin, Page, metaclass=CoderedPageMeta):
     ###############
 
     og_image = models.ForeignKey(
-        'wagtailimages.Image',
+        get_image_model_string(),
         null=True,
         blank=True,
         on_delete=models.SET_NULL,
@@ -235,7 +236,7 @@ class CoderedPage(WagtailCacheMixin, Page, metaclass=CoderedPageMeta):
         help_text=_('Leave blank to use the site name in Settings > Sites')
     )
     struct_org_logo = models.ForeignKey(
-        'wagtailimages.Image',
+        get_image_model_string(),
         null=True,
         blank=True,
         on_delete=models.SET_NULL,
@@ -244,7 +245,7 @@ class CoderedPage(WagtailCacheMixin, Page, metaclass=CoderedPageMeta):
         help_text=_('Leave blank to use the logo in Settings > Layout > Logo')
     )
     struct_org_image = models.ForeignKey(
-        'wagtailimages.Image',
+        get_image_model_string(),
         null=True,
         blank=True,
         on_delete=models.SET_NULL,

+ 2 - 1
coderedcms/models/snippet_models.py

@@ -16,6 +16,7 @@ from wagtail.core.fields import StreamField
 from wagtail.core.models import Orderable
 from wagtail.images.edit_handlers import ImageChooserPanel
 from wagtail.snippets.models import register_snippet
+from wagtail.images import get_image_model_string
 
 from coderedcms.blocks import HTML_STREAMBLOCKS, LAYOUT_STREAMBLOCKS, NAVIGATION_STREAMBLOCKS
 from coderedcms.settings import cr_settings
@@ -87,7 +88,7 @@ class CarouselSlide(Orderable, models.Model):
         verbose_name=_('Carousel'),
     )
     image = models.ForeignKey(
-        'wagtailimages.Image',
+        get_image_model_string(),
         null=True,
         blank=True,
         on_delete=models.SET_NULL,

+ 3 - 2
coderedcms/models/wagtailsettings_models.py

@@ -10,6 +10,7 @@ from django.utils.translation import gettext_lazy as _
 from wagtail.admin.edit_handlers import HelpPanel, FieldPanel, MultiFieldPanel
 from wagtail.images.edit_handlers import ImageChooserPanel
 from wagtail.contrib.settings.models import BaseSetting, register_setting
+from wagtail.images import get_image_model_string
 
 from coderedcms.settings import cr_settings
 
@@ -101,7 +102,7 @@ class LayoutSettings(BaseSetting):
         verbose_name = _('Layout')
 
     logo = models.ForeignKey(
-        'wagtailimages.Image',
+        get_image_model_string(),
         null=True,
         blank=True,
         on_delete=models.SET_NULL,
@@ -110,7 +111,7 @@ class LayoutSettings(BaseSetting):
         help_text=_('Brand logo used in the navbar and throughout the site')
     )
     favicon = models.ForeignKey(
-        'wagtailimages.Image',
+        get_image_model_string(),
         null=True,
         blank=True,
         on_delete=models.SET_NULL,

Some files were not shown because too many files changed in this diff