]> git.parisson.com Git - mezzo.git/commitdiff
add migration for event to blog post link
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 10 May 2016 13:47:08 +0000 (15:47 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 10 May 2016 13:47:08 +0000 (15:47 +0200)
app/migrations/mezzanine_agenda/0013_auto_20160510_1542.py [new file with mode: 0644]
app/templates/agenda/event_detail.html
lib/mezzanine-agenda

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 (file)
index 0000000..dbe8de4
--- /dev/null
@@ -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'),
+        ),
+    ]
index cd12dea89c9d70a9828b490454cabe80d33d369b..12077d0cbd51af174bd7ed2b1e0547c5edb25ac2 100644 (file)
 </a/>
 {% endblock %}
 {% endif %}
-{% endcomment %}
 
 {% block event_detail_keywords %}
 {% keywords_for event as tags %}
 {% endif %}
 {% endblock %}
 
-{% comment %}
 {% block event_detail_rating %}
 <div class="panel panel-default rating">
     <div class="panel-body">
index c96a36c651c3299ede1c9ca094e31a9593b6c052..d9d6a734a2a4897273b562d82c59565c2cb744c6 160000 (submodule)
@@ -1 +1 @@
-Subproject commit c96a36c651c3299ede1c9ca094e31a9593b6c052
+Subproject commit d9d6a734a2a4897273b562d82c59565c2cb744c6