diff --git a/mayan/apps/documents/managers.py b/mayan/apps/documents/managers.py index 481b4d5d10..97f23b8614 100644 --- a/mayan/apps/documents/managers.py +++ b/mayan/apps/documents/managers.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals import logging +from django.apps import apps from django.db import models from .settings import setting_recent_count @@ -21,7 +22,7 @@ class RecentDocumentManager(models.Manager): recent_to_delete.delete() def get_for_user(self, user): - document_model = models.get_model('documents', 'document') + document_model = apps.get_model('documents', 'document') if user.is_authenticated(): return document_model.objects.filter(recentdocument__user=user).order_by('-recentdocument__datetime_accessed') diff --git a/mayan/apps/dynamic_search/classes.py b/mayan/apps/dynamic_search/classes.py index e6c62fb61b..4922ed4e1e 100644 --- a/mayan/apps/dynamic_search/classes.py +++ b/mayan/apps/dynamic_search/classes.py @@ -4,9 +4,9 @@ import datetime import logging import re +from django.apps import apps from django.core.exceptions import PermissionDenied from django.db.models import Q -from django.db.models.loading import get_model from django.utils.module_loading import import_string from acls.models import AccessControlList @@ -87,7 +87,7 @@ class SearchModel(object): search_dict = {} if not self.model: - self.model = get_model(self.app_label, self.model_name) + self.model = apps.get_model(self.app_label, self.model_name) if not self.label: self.label = self.model._meta.verbose_name diff --git a/mayan/apps/events/classes.py b/mayan/apps/events/classes.py index 47fa8d5340..c61a4f4249 100644 --- a/mayan/apps/events/classes.py +++ b/mayan/apps/events/classes.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from django.db import models +from django.apps import apps from django.utils.translation import ugettext_lazy as _ from actstream import action @@ -23,7 +23,7 @@ class Event(object): self.__class__._labels[name] = label def commit(self, actor=None, action_object=None, target=None): - model = models.get_model('events', 'EventType') + model = apps.get_model('events', 'EventType') if not self.event_type: self.event_type, created = model.objects.get_or_create(name=self.name)