From 341ccb35c565c401ed390f48f6903042821de3b9 Mon Sep 17 00:00:00 2001 From: Oleg Lavrovsky Date: Mon, 3 Jul 2017 16:23:20 +0200 Subject: [PATCH] Moved Feedler to separate app --- feedler/__init__.py | 18 ++++++++++++++++++ {publichealth/feedler => feedler}/apps.py | 0 .../migrations/0001_initial.py | 0 .../migrations}/__init__.py | 0 .../feedler => feedler}/models/__init__.py | 0 .../feedler => feedler}/models/admin.py | 0 .../feedler => feedler}/models/models.py | 0 feedler/routes.py | 19 +++++++++++++++++++ {publichealth/feedler => feedler}/tests.py | 0 {publichealth/feedler => feedler}/views.py | 0 .../feedler => feedler}/wagtail_hooks.py | 2 +- publichealth/feedler/migrations/__init__.py | 0 publichealth/home/models/models.py | 2 +- publichealth/settings/base.py | 2 +- tests/testapp/settings.py | 2 ++ 15 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 feedler/__init__.py rename {publichealth/feedler => feedler}/apps.py (100%) rename {publichealth/feedler => feedler}/migrations/0001_initial.py (100%) rename {publichealth/feedler => feedler/migrations}/__init__.py (100%) rename {publichealth/feedler => feedler}/models/__init__.py (100%) rename {publichealth/feedler => feedler}/models/admin.py (100%) rename {publichealth/feedler => feedler}/models/models.py (100%) create mode 100644 feedler/routes.py rename {publichealth/feedler => feedler}/tests.py (100%) rename {publichealth/feedler => feedler}/views.py (100%) rename {publichealth/feedler => feedler}/wagtail_hooks.py (91%) delete mode 100644 publichealth/feedler/migrations/__init__.py diff --git a/feedler/__init__.py b/feedler/__init__.py new file mode 100644 index 0000000..4037eda --- /dev/null +++ b/feedler/__init__.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- + +__author__ = 'Oleg Lavrovsky' +__email__ = 'oleg@datalets.ch' +__version__ = '0.1' + +FEEDLER_APPS = ( + # Wagtail apps + 'wagtail.wagtailcore', + 'wagtail.wagtailadmin', + 'wagtail.contrib.wagtailroutablepage', + 'wagtail.contrib.modeladmin', + + # Third-party apps + + # My apps + 'feedler', +) diff --git a/publichealth/feedler/apps.py b/feedler/apps.py similarity index 100% rename from publichealth/feedler/apps.py rename to feedler/apps.py diff --git a/publichealth/feedler/migrations/0001_initial.py b/feedler/migrations/0001_initial.py similarity index 100% rename from publichealth/feedler/migrations/0001_initial.py rename to feedler/migrations/0001_initial.py diff --git a/publichealth/feedler/__init__.py b/feedler/migrations/__init__.py similarity index 100% rename from publichealth/feedler/__init__.py rename to feedler/migrations/__init__.py diff --git a/publichealth/feedler/models/__init__.py b/feedler/models/__init__.py similarity index 100% rename from publichealth/feedler/models/__init__.py rename to feedler/models/__init__.py diff --git a/publichealth/feedler/models/admin.py b/feedler/models/admin.py similarity index 100% rename from publichealth/feedler/models/admin.py rename to feedler/models/admin.py diff --git a/publichealth/feedler/models/models.py b/feedler/models/models.py similarity index 100% rename from publichealth/feedler/models/models.py rename to feedler/models/models.py diff --git a/feedler/routes.py b/feedler/routes.py new file mode 100644 index 0000000..aa2e5bc --- /dev/null +++ b/feedler/routes.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- + +from datetime import date + +from django.utils.dateformat import DateFormat +from django.utils.formats import date_format +from django.utils.translation import ugettext_lazy as _ +from django.conf import settings + +from wagtail.contrib.wagtailroutablepage.models import RoutablePageMixin, route +from wagtail.wagtailcore.models import Page +from wagtail.wagtailsearch.models import Query + +class FeedlerRoutes(RoutablePageMixin): + + @route(r'^$') + def entries_list(self, request, *args, **kwargs): + self.entries = self.get_entries() + return Page.serve(self, request, *args, **kwargs) diff --git a/publichealth/feedler/tests.py b/feedler/tests.py similarity index 100% rename from publichealth/feedler/tests.py rename to feedler/tests.py diff --git a/publichealth/feedler/views.py b/feedler/views.py similarity index 100% rename from publichealth/feedler/views.py rename to feedler/views.py diff --git a/publichealth/feedler/wagtail_hooks.py b/feedler/wagtail_hooks.py similarity index 91% rename from publichealth/feedler/wagtail_hooks.py rename to feedler/wagtail_hooks.py index dea8ddc..ed8abd5 100644 --- a/publichealth/feedler/wagtail_hooks.py +++ b/feedler/wagtail_hooks.py @@ -11,7 +11,7 @@ class EntryModelAdmin(ModelAdmin): menu_order = 200 add_to_settings_menu = False exclude_from_explorer = True - list_display = ('updated', 'title', 'author', 'tags') + list_display = ('published', 'title', 'author', 'tags') list_filter = ('author', 'tags') search_fields = ('title', 'author', 'content', 'tags') diff --git a/publichealth/feedler/migrations/__init__.py b/publichealth/feedler/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py index 19681db..5ad3f7b 100644 --- a/publichealth/home/models/models.py +++ b/publichealth/home/models/models.py @@ -15,7 +15,7 @@ from wagtail.wagtailimages.blocks import ImageChooserBlock from wagtail.wagtailimages.edit_handlers import ImageChooserPanel from wagtail.wagtailsearch import index -from puput.models import EntryPage, BlogPage +# from puput.models import EntryPage, BlogPage from ..util import TranslatedField diff --git a/publichealth/settings/base.py b/publichealth/settings/base.py index 8c2aff4..fb02160 100644 --- a/publichealth/settings/base.py +++ b/publichealth/settings/base.py @@ -23,7 +23,6 @@ BASE_DIR = os.path.dirname(PROJECT_DIR) INSTALLED_APPS = [ 'publichealth.home', 'publichealth.home.templatetags', - 'publichealth.feedler', 'publichealth.search', 'wagtail.contrib.wagtailsearchpromotions', @@ -48,6 +47,7 @@ INSTALLED_APPS = [ 'taggit', 'puput', 'anymail', + 'feedler', 'django.contrib.admin', 'django.contrib.auth', diff --git a/tests/testapp/settings.py b/tests/testapp/settings.py index 91bc60b..603a7f6 100644 --- a/tests/testapp/settings.py +++ b/tests/testapp/settings.py @@ -1,5 +1,6 @@ import os from puput import PUPUT_APPS +from feedler import FEEDLER_APPS WAGTAIL_SITE_NAME = 'Public Health' BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -16,6 +17,7 @@ INSTALLED_APPS = ( 'django.contrib.staticfiles', ) INSTALLED_APPS += PUPUT_APPS +INSTALLED_APPS += FEEDLER_APPS MIDDLEWARE_CLASSES = ( 'django.contrib.sessions.middleware.SessionMiddleware',