From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 18 Aug 2016 15:48:04 +0000 (+0200)
Subject: Make blocks orderable
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c6bac0c1228512c8e769e518c6b34c90bdc2d8a3;p=mezzo.git

Make blocks orderable
---

diff --git a/app/organization/core/migrations/0012_auto_20160818_1656.py b/app/organization/core/migrations/0012_auto_20160818_1656.py
new file mode 100644
index 00000000..4b1c7be4
--- /dev/null
+++ b/app/organization/core/migrations/0012_auto_20160818_1656.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-18 14:56
+from __future__ import unicode_literals
+
+from django.db import migrations
+import mezzanine.core.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-core', '0011_auto_20160809_1413'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='pageblock',
+            options={'ordering': ('_order',), 'verbose_name': 'page block'},
+        ),
+        migrations.AddField(
+            model_name='pageblock',
+            name='_order',
+            field=mezzanine.core.fields.OrderField(null=True, verbose_name='Order'),
+        ),
+    ]
diff --git a/app/organization/core/models.py b/app/organization/core/models.py
index c1b7c746..eca58a77 100644
--- a/app/organization/core/models.py
+++ b/app/organization/core/models.py
@@ -72,7 +72,7 @@ class BasicPage(Page, SubTitle, Photo, RichText):
         verbose_name = 'basic page'
 
 
-class Block(RichText, Titled):
+class Block(RichText, Titled, Orderable):
 
     with_separator = models.BooleanField(default=False)
     background_color = models.CharField(_('background color'), max_length=32, choices=COLOR_CHOICES, blank=True)
diff --git a/app/organization/project/migrations/0006_auto_20160818_1656.py b/app/organization/project/migrations/0006_auto_20160818_1656.py
new file mode 100644
index 00000000..5182c62e
--- /dev/null
+++ b/app/organization/project/migrations/0006_auto_20160818_1656.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-18 14:56
+from __future__ import unicode_literals
+
+from django.db import migrations
+import mezzanine.core.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-project', '0005_auto_20160818_1539'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='projectblock',
+            options={'ordering': ('_order',)},
+        ),
+        migrations.AddField(
+            model_name='projectblock',
+            name='_order',
+            field=mezzanine.core.fields.OrderField(null=True, verbose_name='Order'),
+        ),
+    ]