From 3f47649d9115177b951d2c5d3aa2774c0179744c Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 2 Jan 2020 15:44:02 +0100 Subject: [PATCH 1/4] Add Phonelist page type --- mpicms/base/models.py | 13 ++++++++++++- mpicms/base/translation.py | 8 +++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/mpicms/base/models.py b/mpicms/base/models.py index 6a85034..2a1b0de 100644 --- a/mpicms/base/models.py +++ b/mpicms/base/models.py @@ -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 @@ -85,7 +86,6 @@ class RootPage(EventMixin, NewsMixin, BasePage): StreamFieldPanel('quick_links') ] - class Meta: # noqa verbose_name = _("root page") verbose_name_plural = _("root pages") @@ -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) diff --git a/mpicms/base/translation.py b/mpicms/base/translation.py index 431f403..30530c7 100644 --- a/mpicms/base/translation.py +++ b/mpicms/base/translation.py @@ -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) @@ -37,3 +37,9 @@ class WikiPageTR(TranslationOptions): 'body', 'sidebar' ) + +@register(PhonelistPage) +class PhonelistPageTR(TranslationOptions): + fields = ( + ) + From 09e9b10e00f9e9bf737bd32f7656e686a0ea2b36 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 2 Jan 2020 15:49:18 +0100 Subject: [PATCH 2/4] Run makemigrations Run ./manage.py makemigrations --- mpicms/base/migrations/0049_phonelistpage.py | 29 ++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 mpicms/base/migrations/0049_phonelistpage.py diff --git a/mpicms/base/migrations/0049_phonelistpage.py b/mpicms/base/migrations/0049_phonelistpage.py new file mode 100644 index 0000000..d655a32 --- /dev/null +++ b/mpicms/base/migrations/0049_phonelistpage.py @@ -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',), + ), + ] From 56191337b38bd982ffbbd2895f241e2a8e88daf4 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 3 Jan 2020 15:44:06 +0100 Subject: [PATCH 3/4] Update translations Run ./manage.py makemessages -l de --- locale/de/LC_MESSAGES/django.po | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index c9bd5ab..87de06f 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -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 \n" "Language-Team: LANGUAGE \n" @@ -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" @@ -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" @@ -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" @@ -1473,6 +1473,18 @@ msgstr "Wikiseite" msgid "wiki pages" msgstr "Wikiseiten" +#: mpicms/base/models.py:126 +#, fuzzy +#| msgid "Phone" +msgid "Phonelist" +msgstr "Telefon" + +#: mpicms/base/models.py:127 +#, fuzzy +#| msgid "Phone" +msgid "Phonelists" +msgstr "Telefon" + #: mpicms/base/views.py:98 msgid "Successfully subscribed to '{}'." msgstr "'{}' erfolgreich abonniert." From 9545636933c11b79d14f76a294b41442937b38a1 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 3 Jan 2020 15:45:31 +0100 Subject: [PATCH 4/4] Update translations --- locale/de/LC_MESSAGES/django.po | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 87de06f..38f5645 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -1474,16 +1474,12 @@ msgid "wiki pages" msgstr "Wikiseiten" #: mpicms/base/models.py:126 -#, fuzzy -#| msgid "Phone" msgid "Phonelist" -msgstr "Telefon" +msgstr "Telefonliste" #: mpicms/base/models.py:127 -#, fuzzy -#| msgid "Phone" msgid "Phonelists" -msgstr "Telefon" +msgstr "Telefonlisten" #: mpicms/base/views.py:98 msgid "Successfully subscribed to '{}'."