Skip to content

Commit

Permalink
Merge pull request #56 from molgen/phonelist-as-wagtail-page
Browse files Browse the repository at this point in the history
Phonelist as wagtail page
  • Loading branch information
donald authored Jan 3, 2020
2 parents a590469 + 9545636 commit 9ab116d
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 12 deletions.
28 changes: 18 additions & 10 deletions locale/de/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-01-03 15:24+0100\n"
"POT-Creation-Date: 2020-01-03 15:43+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -366,7 +366,7 @@ msgid "Small integer"
msgstr ""

#: bla/lib/python3.7/site-packages/django/db/models/fields/__init__.py:2081
#: mpicms/base/models.py:68
#: mpicms/base/models.py:69
msgid "Text"
msgstr "Text"

Expand Down Expand Up @@ -1391,7 +1391,7 @@ msgstr "Tabelle"
msgid "content"
msgstr "Inhalt"

#: mpicms/base/blocks.py:38 mpicms/base/blocks.py:41 mpicms/base/models.py:67
#: mpicms/base/blocks.py:38 mpicms/base/blocks.py:41 mpicms/base/models.py:68
#: mpicms/templates/personal/list.html:40
msgid "Title"
msgstr "Titel"
Expand Down Expand Up @@ -1420,32 +1420,32 @@ msgstr "Kontakte"
msgid "Sidebar Content"
msgstr "Inhalt der Seitenleiste"

#: mpicms/base/models.py:39 mpicms/personal/models.py:68
#: mpicms/base/models.py:40 mpicms/personal/models.py:68
#: mpicms/personal/models.py:95 mpicms/publications/models.py:15
msgid "title"
msgstr "Titel"

#: mpicms/base/models.py:40
#: mpicms/base/models.py:41
msgid "text"
msgstr "Text"

#: mpicms/base/models.py:52 mpicms/base/models.py:63
#: mpicms/base/models.py:53 mpicms/base/models.py:64
msgid "featured image"
msgstr "Titelbild"

#: mpicms/base/models.py:53
#: mpicms/base/models.py:54
msgid "featured images"
msgstr "Titelbilder"

#: mpicms/base/models.py:69 mpicms/base/models.py:70
#: mpicms/base/models.py:70 mpicms/base/models.py:71
msgid "Banner"
msgstr "Banner"

#: mpicms/base/models.py:73
#: mpicms/base/models.py:74
msgid "Footer Items"
msgstr "Footer Menüs"

#: mpicms/base/models.py:76
#: mpicms/base/models.py:77
msgid "Quick Links"
msgstr "Quick Links"

Expand Down Expand Up @@ -1473,6 +1473,14 @@ msgstr "Wikiseite"
msgid "wiki pages"
msgstr "Wikiseiten"

#: mpicms/base/models.py:126
msgid "Phonelist"
msgstr "Telefonliste"

#: mpicms/base/models.py:127
msgid "Phonelists"
msgstr "Telefonlisten"

#: mpicms/base/views.py:98
msgid "Successfully subscribed to '{}'."
msgstr "'{}' erfolgreich abonniert."
Expand Down
29 changes: 29 additions & 0 deletions mpicms/base/migrations/0049_phonelistpage.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Generated by Django 2.2.9 on 2020-01-02 14:48

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('wagtailcore', '0041_group_collection_permissions_verbose_name_plural'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('base', '0048_auto_20190911_1652'),
]

operations = [
migrations.CreateModel(
name='PhonelistPage',
fields=[
('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
('subscribers', models.ManyToManyField(to=settings.AUTH_USER_MODEL)),
],
options={
'verbose_name': 'Phonelist',
'verbose_name_plural': 'Phonelists',
},
bases=('wagtailcore.page',),
),
]
13 changes: 12 additions & 1 deletion mpicms/base/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from .mixins import BasePage, BodyMixin, SideBarMixin
from .blocks import MenuBlock

from mpicms.personal.views import ContactListView

Page.show_in_menus_default = True

Expand Down Expand Up @@ -85,7 +86,6 @@ class RootPage(EventMixin, NewsMixin, BasePage):
StreamFieldPanel('quick_links')
]


class Meta: # noqa
verbose_name = _("root page")
verbose_name_plural = _("root pages")
Expand Down Expand Up @@ -117,3 +117,14 @@ class WikiPage(CategoryMixin, SideBarMixin, BodyMixin, BasePage):
class Meta: # noqa
verbose_name = _("wiki page")
verbose_name_plural = _("wiki pages")

class PhonelistPage(BasePage):
content_panels = Page.content_panels
promote_panels = Page.promote_panels

class Meta: # noqa
verbose_name = _("Phonelist")
verbose_name_plural = _("Phonelists")

def serve(self, request):
return ContactListView.as_view()(request)
8 changes: 7 additions & 1 deletion mpicms/base/translation.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from modeltranslation.translator import TranslationOptions
from modeltranslation.decorators import register

from .models import WikiPage, RootPage, HomePage, FeaturedImage
from .models import WikiPage, RootPage, HomePage, FeaturedImage, PhonelistPage


@register(FeaturedImage)
Expand Down Expand Up @@ -37,3 +37,9 @@ class WikiPageTR(TranslationOptions):
'body',
'sidebar'
)

@register(PhonelistPage)
class PhonelistPageTR(TranslationOptions):
fields = (
)

0 comments on commit 9ab116d

Please sign in to comment.