Merge pull request #1 from Satchitananda/patch-1

Django native migration fix
vit-ivanov · Oct 23, 2015 · a85faad · a85faad
2 parents e6f8e67 + afb60ae
commit a85faad
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/sitetree/migrations/0001_initial.py b/sitetree/migrations/0001_initial.py
@@ -8,7 +8,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('auth', '0001_initial'),
+        ('auth', '0006_require_contenttypes_0002'),
     ]
 
     operations = [
@@ -24,19 +24,18 @@ class Migration(migrations.Migration):
                 'verbose_name': 'Site Tree',
                 'verbose_name_plural': 'Site Trees',
             },
-            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='TreeItem',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('title', models.CharField(help_text='Site tree item title. Can contain template variables E.g.: {{ mytitle }}.', max_length=100, verbose_name='Title')),
-                ('hint', models.CharField(default='', help_text='Some additional information about this item that is used as a hint.', max_length=200, verbose_name='Hint', blank=True)),
+                ('hint', models.CharField(default=b'', help_text='Some additional information about this item that is used as a hint.', max_length=200, verbose_name='Hint', blank=True)),
                 ('url', models.CharField(help_text='Exact URL or URL pattern (see "Additional settings") for this item.', max_length=200, verbose_name='URL', db_index=True)),
                 ('urlaspattern', models.BooleanField(default=False, help_text='Whether the given URL should be treated as a pattern.<br /><b>Note:</b> Refer to Django "URL dispatcher" documentation (e.g. "Naming URL patterns" part).', db_index=True, verbose_name='URL as Pattern')),
                 ('hidden', models.BooleanField(default=False, help_text='Whether to show this item in navigation.', db_index=True, verbose_name='Hidden')),
-                ('alias', sitetree.models.CharFieldNullable(max_length=80, blank=True, help_text='Short name to address site tree item from a template.<br /><b>Reserved aliases:</b> "trunk", "this-children", "this-siblings", "this-ancestor-children", "this-parent-siblings".', null=True, verbose_name='Alias', db_index=True)),
-                ('description', models.TextField(default='', help_text='Additional comments on this item.', verbose_name='Description', blank=True)),
+                ('alias', sitetree.models.CharFieldNullable(max_length=80, blank=True, help_text='Short name to address site tree item from a template.<br /><b>Reserved aliases:</b> "trunk", "this-children", "this-siblings", "this-ancestor-children", "this-parent-siblings", "this-softroot".', null=True, verbose_name='Alias', db_index=True)),
+                ('description', models.TextField(default=b'', help_text='Additional comments on this item.', verbose_name='Description', blank=True)),
                 ('inmenu', models.BooleanField(default=True, help_text='Whether to show this item in a menu.', db_index=True, verbose_name='Show in menu')),
                 ('inbreadcrumbs', models.BooleanField(default=True, help_text='Whether to show this item in a breadcrumb path.', db_index=True, verbose_name='Show in breadcrumb path')),
                 ('insitetree', models.BooleanField(default=True, help_text='Whether to show this item in a site tree.', db_index=True, verbose_name='Show in site tree')),
@@ -45,6 +44,8 @@ class Migration(migrations.Migration):
                 ('access_restricted', models.BooleanField(default=False, help_text='Check it to restrict user access to this item, using Django permissions system.', db_index=True, verbose_name='Restrict access to permissions')),
                 ('access_perm_type', models.IntegerField(default=1, help_text='<b>Any</b> &mdash; user should have any of chosen permissions. <b>All</b> &mdash; user should have all chosen permissions.', verbose_name='Permissions interpretation', choices=[(1, 'Any'), (2, 'All')])),
                 ('sort_order', models.IntegerField(default=0, help_text='Item position among other site tree items under the same parent.', verbose_name='Sort order', db_index=True)),
+                ('softroot_for', models.CharField(default=b'', max_length=200, verbose_name='Soft root for menu', blank=True)),
+                ('hide_from', models.CharField(default=b'', max_length=200, verbose_name='Hide from menu', blank=True)),
                 ('access_permissions', models.ManyToManyField(to='auth.Permission', verbose_name='Permissions granting access', blank=True)),
                 ('parent', models.ForeignKey(related_name='treeitem_parent', blank=True, to='sitetree.TreeItem', help_text='Parent site tree item.', null=True, verbose_name='Parent')),
                 ('tree', models.ForeignKey(related_name='treeitem_tree', verbose_name='Site Tree', to='sitetree.Tree', help_text='Site tree this item belongs to.')),
@@ -54,7 +55,6 @@ class Migration(migrations.Migration):
                 'verbose_name': 'Site Tree Item',
                 'verbose_name_plural': 'Site Tree Items',
             },
-            bases=(models.Model,),
         ),
         migrations.AlterUniqueTogether(
             name='treeitem',