Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-04-15 04:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replaced models.get_models with apps.get_models

Browse source
This commit is contained in:
Karl Hobley 2015-03-23 19:57:34 +00:00
parent f9924fa015
commit ed3ddcc6c0
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wagtail/contrib/wagtailfrontendcache/signal_handlers.py
View file

@ -1,4 +1,4 @@
from django.db import models
from django.apps import apps
from wagtail.wagtailcore.signals import page_published, page_unpublished
@ -15,8 +15,8 @@ def page_unpublished_signal_handler(instance, **kwargs):
def register_signal_handlers():
# Get list of models that are page types
Page = models.get_model('wagtailcore', 'Page')
indexed_models = [model for model in models.get_models() if issubclass(model, Page)]
Page = apps.get_model('wagtailcore', 'Page')
indexed_models = [model for model in apps.get_models() if issubclass(model, Page)]
# Loop through list and register signal handlers for each one
for model in indexed_models:

4
wagtail/wagtailimages/models.py
View file

@ -261,7 +261,7 @@ def image_delete(sender, instance, **kwargs):
def get_image_model():
from django.conf import settings
from django.db.models import get_model
from django.apps import apps
try:
app_label, model_name = settings.WAGTAILIMAGES_IMAGE_MODEL.split('.')
@ -270,7 +270,7 @@ def get_image_model():
except ValueError:
raise ImproperlyConfigured("WAGTAILIMAGES_IMAGE_MODEL must be of the form 'app_label.model_name'")
image_model = get_model(app_label, model_name)
image_model = apps.get_model(app_label, model_name)
if image_model is None:
raise ImproperlyConfigured("WAGTAILIMAGES_IMAGE_MODEL refers to model '%s' that has not been installed" % settings.WAGTAILIMAGES_IMAGE_MODEL)
return image_model

3
wagtail/wagtailsearch/index.py
View file

@ -3,6 +3,7 @@ import warnings
from six import string_types
from django.db import models
from django.apps import apps
class Indexed(object):
@ -74,7 +75,7 @@ class Indexed(object):
def get_indexed_models():
return [
model for model in models.get_models()
model for model in apps.get_models()
if issubclass(model, Indexed) and not model._meta.abstract
]