pedro/django-orchestra-test
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

dj1.9: Fixed contenttype model import on resources

Browse source
This commit is contained in:
Marc Aymerich 2016-04-27 12:55:35 +00:00
parent c201b6f03d
commit 0684b00963
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
orchestra/contrib/resources/backends.py
View file

@ -1,6 +1,5 @@
import datetime import datetime
from django.contrib.contenttypes.models import ContentType
from django.utils import timezone from django.utils import timezone
from django.utils.functional import cached_property from django.utils.functional import cached_property
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
@ -38,6 +37,7 @@ class ServiceMonitor(ServiceBackend):
@cached_property @cached_property
def content_type(self): def content_type(self):
from django.contrib.contenttypes.models import ContentType
app_label, model = self.model.split('.') app_label, model = self.model.split('.')
model = model.lower() model = model.lower()
return ContentType.objects.get_by_natural_key(app_label, model) return ContentType.objects.get_by_natural_key(app_label, model)
@ -68,6 +68,7 @@ class ServiceMonitor(ServiceBackend):
def store(self, log): def store(self, log):
""" stores monitored values from stdout """ """ stores monitored values from stdout """
from django.contrib.contenttypes.models import ContentType
from .models import MonitorData from .models import MonitorData
name = self.get_name() name = self.get_name()
app_label, model_name = self.model.split('.') app_label, model_name = self.model.split('.')