Merge pull request #4698 from yakky/merge/4329

Merge #4329

CHANGELOG.txt

@@ -1,3 +1,8 @@
+=== 3.3.0 (Unreleased) ===
+
+* Removed support for Django 1.6, 1.7 and python 2.6
+* Set the default value of CMSPlugin.position to 0 instead of null
+
 === 3.2.1 (Unreleased) ===
 
 - Fixed an issue with refreshing the UI when switching CMS language

cms/migrations/0014_auto_20151111_2359.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0013_urlconfrevision'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='cmsplugin',
+            name='position',
+            field=models.PositiveSmallIntegerField(default=0, verbose_name='position', editable=False),
+        ),
+    ]

cms/models/pluginmodel.py

@@ -75,7 +75,7 @@ class CMSPlugin(six.with_metaclass(PluginModelBase, MP_Node)):
     '''
     placeholder = models.ForeignKey(Placeholder, editable=False, null=True)
     parent = models.ForeignKey('self', blank=True, null=True, editable=False)
-    position = models.PositiveSmallIntegerField(_("position"), blank=True, null=True, editable=False)
+    position = models.PositiveSmallIntegerField(_("position"), default = 0, editable=False)
     language = models.CharField(_("language"), max_length=15, blank=False, db_index=True, editable=False)
     plugin_type = models.CharField(_("plugin_name"), max_length=50, db_index=True, editable=False)
     creation_date = models.DateTimeField(_("creation date"), editable=False, default=timezone.now)

cms/tests/test_nested_plugins.py

@@ -224,7 +224,7 @@ def test_plugin_fix_tree(self):
 
         original_plugins = (placeholder.get_plugins().order_by('position', 'path'))
 
-        CMSPlugin.objects.update(position=None)
+        CMSPlugin.objects.update(position=0)
         CMSPlugin.fix_tree()
 
         new_plugins = list(placeholder.get_plugins().order_by('position', 'path'))