Merge pull request django-polymorphic#3 from maartendraijer/master

Move 'layout' field to FluentPage model
maartendraijer · Jul 18, 2012 · 88ec832 · 88ec832
2 parents 641736e + af92045
commit 88ec832
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/README.rst b/README.rst
@@ -99,7 +99,7 @@ The ``models.py`` file should define the custom node type, and any fields it has
         A page that renders RST code.
         """
         rst_content = models.TextField(_("RST contents"))
-        template = models.ChatField(_("Template"), max_length=200, choices=RST_TEMPLATE_CHOICES)
+        template = models.CharField(_("Template"), max_length=200, choices=RST_TEMPLATE_CHOICES)
 
         class Meta:
             verbose_name = _("RST page")

diff --git a/fluent_pages/pagetypes/fluentpage/models.py b/fluent_pages/pagetypes/fluentpage/models.py
@@ -7,8 +7,7 @@ class FluentPageBase(HtmlPage):
     """
     A ```FluentPage``` represents one HTML page of the site.
     """
-    layout = models.ForeignKey(PageLayout, verbose_name=_('Layout'))
-
+
     # Access to fluent-contents via the model
     placeholder_set = PlaceholderRelation()
     contentitem_set = ContentItemRelation()
@@ -26,4 +25,4 @@ class FluentPage(FluentPageBase):
     """
     A ```FluentPage``` represents one HTML page of the site.
     """
-    pass
+    layout = models.ForeignKey(PageLayout, verbose_name=_('Layout'))