From 7d51d3b1d1fe78133c6d7277ba4d6d063ca7678f Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 10 May 2016 15:47:08 +0200 Subject: [PATCH] add migration for event to blog post link --- .../0013_auto_20160510_1542.py | 25 +++++++++++++++++++ app/templates/agenda/event_detail.html | 2 -- lib/mezzanine-agenda | 2 +- 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 app/migrations/mezzanine_agenda/0013_auto_20160510_1542.py diff --git a/app/migrations/mezzanine_agenda/0013_auto_20160510_1542.py b/app/migrations/mezzanine_agenda/0013_auto_20160510_1542.py new file mode 100644 index 00000000..dbe8de4f --- /dev/null +++ b/app/migrations/mezzanine_agenda/0013_auto_20160510_1542.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-05-10 13:42 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('blog', '0003_auto_20151223_1313'), + ('mezzanine_agenda', '0012_auto_20160410_2336'), + ] + + operations = [ + migrations.AlterModelOptions( + name='eventprice', + options={'ordering': ('-value',), 'verbose_name': 'Event price', 'verbose_name_plural': 'Event pricies'}, + ), + migrations.AddField( + model_name='event', + name='blog_posts', + field=models.ManyToManyField(blank=True, related_name='events', to='blog.BlogPost', verbose_name='blog posts'), + ), + ] diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html index cd12dea8..12077d0c 100644 --- a/app/templates/agenda/event_detail.html +++ b/app/templates/agenda/event_detail.html @@ -106,7 +106,6 @@ {% endblock %} {% endif %} -{% endcomment %} {% block event_detail_keywords %} {% keywords_for event as tags %} @@ -122,7 +121,6 @@ {% endif %} {% endblock %} -{% comment %} {% block event_detail_rating %}
diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda index c96a36c6..d9d6a734 160000 --- a/lib/mezzanine-agenda +++ b/lib/mezzanine-agenda @@ -1 +1 @@ -Subproject commit c96a36c651c3299ede1c9ca094e31a9593b6c052 +Subproject commit d9d6a734a2a4897273b562d82c59565c2cb744c6 -- 2.39.5