issue #3: merge controllers into programs; missing: views

This commit is contained in:
bkfox
2016-08-29 15:45:17 +02:00
parent f5ec634e3c
commit edd4c7ec87
20 changed files with 875 additions and 1726 deletions

View File

@ -28,7 +28,6 @@ from taggit.models import TaggedItemBase
import bleach
import aircox.programs.models as programs
import aircox.controllers.models as controllers
import aircox.cms.settings as settings
from aircox.cms.utils import image_url
@ -649,7 +648,7 @@ class LogsPage(DatedListPage):
template = 'cms/dated_list_page.html'
station = models.ForeignKey(
controllers.Station,
programs.Station,
verbose_name = _('station'),
null = True,
on_delete=models.SET_NULL,

View File

@ -34,7 +34,6 @@ from taggit.models import TaggedItemBase
# aircox
import aircox.programs.models as programs
import aircox.controllers.models as controllers
def related_pages_filter(reset_cache=False):
@ -856,7 +855,7 @@ class SectionList(ListBase, SectionRelativeItem):
@register_snippet
class SectionLogsList(SectionItem):
station = models.ForeignKey(
controllers.Station,
programs.Station,
verbose_name = _('station'),
null = True,
on_delete=models.SET_NULL,