From 5810d4987180bb98f3425cd64fb46938242a7085 Mon Sep 17 00:00:00 2001 From: Simon Meers Date: Mon, 11 Nov 2013 10:11:20 +1100 Subject: [PATCH 1/2] Decouple PageSitemap from the One Page Model. See #241. --- feincms/module/page/sitemap.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/feincms/module/page/sitemap.py b/feincms/module/page/sitemap.py index 89d22c760..eef72264f 100644 --- a/feincms/module/page/sitemap.py +++ b/feincms/module/page/sitemap.py @@ -2,19 +2,18 @@ # coding=utf-8 # ------------------------------------------------------------------------ +from django.conf import settings from django.db.models import Max +from django.db.models import get_model from django.contrib.sitemaps import Sitemap -from feincms.module.page.models import Page - - # ------------------------------------------------------------------------ class PageSitemap(Sitemap): """ The PageSitemap can be used to automatically generate sitemap.xml files for submission to index engines. See http://www.sitemaps.org/ for details. """ - def __init__(self, navigation_only=False, max_depth=0, changefreq=None, queryset=None, filter=None, extended_navigation=False, *args, **kwargs): + def __init__(self, navigation_only=False, max_depth=0, changefreq=None, queryset=None, filter=None, extended_navigation=False, page_model=settings.FEINCMS_DEFAULT_PAGE_MODEL, *args, **kwargs): """ The PageSitemap accepts the following parameters for customisation of the resulting sitemap.xml output: @@ -42,6 +41,7 @@ def __init__(self, navigation_only=False, max_depth=0, changefreq=None, queryset if queryset is not None: self.queryset = queryset else: + Page = get_model(*page_model.split('.')) self.queryset = Page.objects.active() def items(self): From d612457f70792e045cea01dddc23b800505fe272 Mon Sep 17 00:00:00 2001 From: Simon Meers Date: Tue, 12 Nov 2013 20:20:03 +1100 Subject: [PATCH 2/2] import settings from feincms module in page.sitemap --- feincms/module/page/sitemap.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/feincms/module/page/sitemap.py b/feincms/module/page/sitemap.py index eef72264f..fa1f640a7 100644 --- a/feincms/module/page/sitemap.py +++ b/feincms/module/page/sitemap.py @@ -2,11 +2,12 @@ # coding=utf-8 # ------------------------------------------------------------------------ -from django.conf import settings from django.db.models import Max from django.db.models import get_model from django.contrib.sitemaps import Sitemap +from feincms import settings + # ------------------------------------------------------------------------ class PageSitemap(Sitemap): """