ctactic/aircox-radiocampus
1
0
Fork 0
forked from rc/aircox
Code Issues 10 Pull Requests Activity

update dependencies

Browse Source
This commit is contained in:
bkfox
2019-05-11 15:15:57 +02:00
parent 1ebafb5241
commit a951d7a319
13 changed files with 90 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
aircox_cms/models/__init__.py
View File

@ -8,16 +8,16 @@ from django.utils.translation import ugettext as _, ugettext_lazy
# pages and panels
from wagtail.contrib.settings.models import BaseSetting, register_setting
from wagtail.wagtailcore.models import Page, Orderable, \
from wagtail.core.models import Page, Orderable, \
PageManager, PageQuerySet
from wagtail.wagtailcore.fields import RichTextField
from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
from wagtail.wagtailadmin.edit_handlers import FieldPanel, FieldRowPanel, \
from wagtail.core.fields import RichTextField
from wagtail.images.edit_handlers import ImageChooserPanel
from wagtail.admin.edit_handlers import FieldPanel, FieldRowPanel, \
MultiFieldPanel, InlinePanel, PageChooserPanel, StreamFieldPanel
from wagtail.wagtailsearch import index
from wagtail.search import index
# snippets
from wagtail.wagtailsnippets.models import register_snippet
from wagtail.snippets.models import register_snippet
# tags
from modelcluster.fields import ParentalKey
@ -40,6 +40,7 @@ from aircox_cms.utils import image_url
class WebsiteSettings(BaseSetting):
station = models.OneToOneField(
aircox.models.Station,
models.SET_NULL,
verbose_name = _('aircox station'),
related_name = 'website_settings',
unique = True,
@ -70,6 +71,7 @@ class WebsiteSettings(BaseSetting):
)
list_page = models.ForeignKey(
'aircox_cms.DynamicListPage',
on_delete=models.CASCADE,
verbose_name = _('page for lists'),
help_text=_('page used to display the results of a search and other '
'lists'),
@ -121,6 +123,7 @@ class WebsiteSettings(BaseSetting):
# done manually, when the user edit it.
)
)
default_programs_page = ParentalKey(
Page,
verbose_name = _('default programs page'),
@ -133,7 +136,7 @@ class WebsiteSettings(BaseSetting):
# /doc/ (technicians, admin): if the page has not been created,
# it still can be created using the `programs_to_cms` command.
),
limit_choices_to = lambda: {
limit_choices_to = {
'show_in_menus': True,
'publication__isnull': False,
},
@ -167,6 +170,7 @@ class WebsiteSettings(BaseSetting):
class Comment(models.Model):
publication = models.ForeignKey(
Page,
on_delete=models.CASCADE,
verbose_name = _('page')
)
published = models.BooleanField(

8
aircox_cms/models/lists.py
View File

@ -16,10 +16,10 @@ from django.utils.translation import ugettext as _, ugettext_lazy
from django.utils import timezone as tz
from django.utils.functional import cached_property
from wagtail.wagtailadmin.edit_handlers import *
from wagtail.wagtailcore.models import Page, Orderable
from wagtail.wagtailimages.models import Image
from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
from wagtail.admin.edit_handlers import *
from wagtail.core.models import Page, Orderable
from wagtail.images.models import Image
from wagtail.images.edit_handlers import ImageChooserPanel
from aircox_cms.utils import related_pages_filter

19
aircox_cms/models/sections.py
View File

@ -10,11 +10,11 @@ from django.urls import reverse
from modelcluster.models import ClusterableModel
from modelcluster.fields import ParentalKey
from wagtail.wagtailadmin.edit_handlers import *
from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
from wagtail.wagtailcore.models import Page
from wagtail.wagtailcore.fields import RichTextField
from wagtail.wagtailsnippets.models import register_snippet
from wagtail.admin.edit_handlers import *
from wagtail.images.edit_handlers import ImageChooserPanel
from wagtail.core.models import Page
from wagtail.core.fields import RichTextField
from wagtail.snippets.models import register_snippet
import aircox.models
from aircox_cms.models.lists import *
@ -52,6 +52,7 @@ class Region(ClusterableModel):
)
model = models.ForeignKey(
ContentType,
on_delete=models.CASCADE,
verbose_name = _('model'),
blank = True, null = True,
help_text=_('this section is displayed only when the current '
@ -60,6 +61,7 @@ class Region(ClusterableModel):
)
page = models.ForeignKey(
Page,
on_delete=models.CASCADE,
verbose_name = _('page'),
blank = True, null = True,
help_text=_('this section is displayed only on this page'),
@ -218,7 +220,7 @@ class SectionText(Section):
]
def get_context(self, request, page):
from wagtail.wagtailcore.rich_text import expand_db_html
from wagtail.core.rich_text import expand_db_html
context = super().get_context(request, page)
context['content'] = expand_db_html(self.body)
return context
@ -232,6 +234,7 @@ class SectionImage(SectionRelativeItem):
image = models.ForeignKey(
'wagtailimages.Image',
on_delete=models.CASCADE,
verbose_name = _('image'),
related_name='+',
blank=True, null=True,
@ -307,7 +310,7 @@ class SectionImage(SectionRelativeItem):
return self.cache
def get_context(self, request, page):
from wagtail.wagtailimages.views.serve import generate_signature
from wagtail.images.views.serve import generate_signature
context = super().get_context(request, page)
image = self.related_attr(page, 'cover') or self.image
@ -461,11 +464,13 @@ class SectionTimetable(Section,DatedBaseList):
station = models.ForeignKey(
aircox.models.Station,
on_delete=models.CASCADE,
verbose_name = _('station'),
help_text = _('(required) related station')
)
target = models.ForeignKey(
'aircox_cms.TimetablePage',
on_delete=models.CASCADE,
verbose_name = _('timetable page'),
blank = True, null = True,
help_text = _('select a timetable page used to show complete timetable'),