Merge branch 'master' into 57-styling-bread. Workson #57.

bakerydemo/base/wagtail_hooks.py

@@ -1,7 +1,7 @@
 from wagtail.contrib.modeladmin.options import (
     ModelAdmin, ModelAdminGroup, modeladmin_register)
 
-from bakerydemo.breads.models import Country, BreadType
+from bakerydemo.breads.models import Country, BreadIngredient, BreadType
 from bakerydemo.base.models import People, FooterText
 
 '''
@@ -21,9 +21,13 @@ font-awesome icon set is available to you. Options are at http://fontawesome.io/
 '''
 
 
-class BreadTypeAdmin(ModelAdmin):
+class BreadIngredientAdmin(ModelAdmin):
     # These stub classes allow us to put various models into the custom "Wagtail Bakery" menu item
     # rather than under the default Snippets section.
+    model = BreadIngredient
+
+
+class BreadTypeAdmin(ModelAdmin):
     model = BreadType
 
 
@@ -35,7 +39,7 @@ class BreadModelAdminGroup(ModelAdminGroup):
     menu_label = 'Bread Categories'
     menu_icon = 'fa-suitcase'  # change as required
     menu_order = 200  # will put in 3rd place (000 being 1st, 100 2nd)
-    items = (BreadTypeAdmin, BreadCountryAdmin)
+    items = (BreadIngredientAdmin, BreadTypeAdmin, BreadCountryAdmin)
 
 
 class PeopleModelAdmin(ModelAdmin):

bakerydemo/breads/migrations/0005_auto_20170224_1047.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-24 10:47
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import modelcluster.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('breads', '0004_auto_20170220_0111'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='BreadIngredient',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+            ],
+            options={
+                'verbose_name_plural': 'Bread ingredients',
+            },
+        ),
+        migrations.AddField(
+            model_name='breadpage',
+            name='ingredients',
+            field=modelcluster.fields.ParentalManyToManyField(blank=True, to='breads.BreadIngredient'),
+        ),
+    ]

bakerydemo/breads/models.py

@@ -1,7 +1,12 @@
+from django import forms
 from django.db import models
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 
-from wagtail.wagtailadmin.edit_handlers import FieldPanel, StreamFieldPanel
+from modelcluster.fields import ParentalManyToManyField
+
+from wagtail.wagtailadmin.edit_handlers import (
+    FieldPanel, MultiFieldPanel, StreamFieldPanel
+)
 from wagtail.wagtailcore.fields import StreamField
 from wagtail.wagtailcore.models import Page
 
@@ -28,6 +33,25 @@ class Country(models.Model):
         verbose_name_plural = "Countries of Origin"
 
 
+@register_snippet
+class BreadIngredient(models.Model):
+    """
+    Standard Django model used as a Snippet in the BreadPage model.
+    Demonstrates ManyToMany relationship.
+    """
+    name = models.CharField(max_length=255)
+
+    panels = [
+        FieldPanel('name'),
+    ]
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        verbose_name_plural = 'Bread ingredients'
+
+
 @register_snippet
 class BreadType(models.Model):
     """
@@ -68,11 +92,22 @@ class BreadPage(BasePageFieldsMixin, Page):
         on_delete=models.SET_NULL,
         related_name='+'
     )
+    ingredients = ParentalManyToManyField('BreadIngredient', blank=True)
 
     content_panels = BasePageFieldsMixin.content_panels + [
         StreamFieldPanel('body'),
         FieldPanel('origin'),
         FieldPanel('bread_type'),
+        MultiFieldPanel(
+            [
+                FieldPanel(
+                    'ingredients',
+                    widget=forms.CheckboxSelectMultiple,
+                ),
+            ],
+            heading="Additional Metadata",
+            classname="collapsible collapsed"
+        ),
     ]
 
     search_fields = Page.search_fields + [

bakerydemo/templates/breads/bread_page.html

@@ -9,5 +9,17 @@
 
     <p>{{ page.origin }}</p>
     <p>{{ page.bread_type }}</p>
+    {% with ingredients=page.ingredients.all %}
+        {% if ingredients %}
+            <h3>Ingredients:</h3>
+            <ul>
+                {% for ingredient in ingredients %}
+                    <li style="display: inline">
+                        {{ ingredient.name }}
+                    </li>
+                {% endfor %}
+            </ul>
+        {% endif %}
+    {% endwith %}
     {{ page.body }}
 {% endblock content %}