diff --git a/cms/migrations_django/0001_initial.py b/cms/migrations_django/0001_initial.py index 5b93dec1ee8..6ae1fb9dc11 100644 --- a/cms/migrations_django/0001_initial.py +++ b/cms/migrations_django/0001_initial.py @@ -2,34 +2,32 @@ from __future__ import unicode_literals from django.db import models, migrations -import cms.models.fields from django.conf import settings import django.utils.timezone -import cms.models.static_placeholder class Migration(migrations.Migration): dependencies = [ ('auth', '0001_initial'), - ('sites', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('sites', '0001_initial'), ] operations = [ migrations.CreateModel( name='CMSPlugin', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), - ('position', models.PositiveSmallIntegerField(editable=False, verbose_name='position', blank=True, null=True)), - ('language', models.CharField(editable=False, verbose_name='language', db_index=True, max_length=15)), - ('plugin_type', models.CharField(editable=False, verbose_name='plugin name', db_index=True, max_length=50)), - ('creation_date', models.DateTimeField(editable=False, verbose_name='creation date', default=django.utils.timezone.now)), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), + ('position', models.PositiveSmallIntegerField(null=True, editable=False, blank=True, verbose_name='position')), + ('language', models.CharField(db_index=True, max_length=15, verbose_name='language', editable=False)), + ('plugin_type', models.CharField(db_index=True, max_length=50, verbose_name='plugin name', editable=False)), + ('creation_date', models.DateTimeField(default=django.utils.timezone.now, verbose_name='creation date', editable=False)), ('changed_date', models.DateTimeField(auto_now=True)), - ('level', models.PositiveIntegerField(editable=False, db_index=True)), - ('lft', models.PositiveIntegerField(editable=False, db_index=True)), - ('rght', models.PositiveIntegerField(editable=False, db_index=True)), - ('tree_id', models.PositiveIntegerField(editable=False, db_index=True)), + ('level', models.PositiveIntegerField(db_index=True, editable=False)), + ('lft', models.PositiveIntegerField(db_index=True, editable=False)), + ('rght', models.PositiveIntegerField(db_index=True, editable=False)), + ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)), ], options={ }, @@ -38,8 +36,8 @@ class Migration(migrations.Migration): migrations.CreateModel( name='AliasPluginModel', fields=[ - ('cmsplugin_ptr', models.OneToOneField(serialize=False, parent_link=True, auto_created=True, to='cms.CMSPlugin', primary_key=True)), - ('plugin', models.ForeignKey(related_name='alias_reference', editable=False, to='cms.CMSPlugin', null=True)), + ('cmsplugin_ptr', models.OneToOneField(primary_key=True, to='cms.CMSPlugin', auto_created=True, parent_link=True, serialize=False)), + ('plugin', models.ForeignKey(null=True, to='cms.CMSPlugin', related_name='alias_reference', editable=False)), ], options={ }, @@ -48,25 +46,25 @@ class Migration(migrations.Migration): migrations.AddField( model_name='cmsplugin', name='parent', - field=models.ForeignKey(blank=True, editable=False, to='cms.CMSPlugin', null=True), + field=models.ForeignKey(null=True, to='cms.CMSPlugin', blank=True, editable=False), preserve_default=True, ), migrations.CreateModel( name='GlobalPagePermission', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), - ('can_change', models.BooleanField(verbose_name='can edit', default=True)), - ('can_add', models.BooleanField(verbose_name='can add', default=True)), - ('can_delete', models.BooleanField(verbose_name='can delete', default=True)), - ('can_change_advanced_settings', models.BooleanField(verbose_name='can change advanced settings', default=False)), - ('can_publish', models.BooleanField(verbose_name='can publish', default=True)), - ('can_change_permissions', models.BooleanField(help_text='on page level', default=False, verbose_name='can change permissions')), - ('can_move_page', models.BooleanField(verbose_name='can move', default=True)), - ('can_view', models.BooleanField(help_text='frontend view restriction', default=False, verbose_name='view restricted')), - ('can_recover_page', models.BooleanField(help_text='can recover any deleted page', default=True, verbose_name='can recover pages')), - ('group', models.ForeignKey(blank=True, verbose_name='group', to='auth.Group', null=True)), - ('sites', models.ManyToManyField(help_text='If none selected, user haves granted permissions to all sites.', blank=True, to='sites.Site', null=True, verbose_name='sites')), - ('user', models.ForeignKey(blank=True, verbose_name='user', to=settings.AUTH_USER_MODEL, null=True)), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), + ('can_change', models.BooleanField(default=True, verbose_name='can edit')), + ('can_add', models.BooleanField(default=True, verbose_name='can add')), + ('can_delete', models.BooleanField(default=True, verbose_name='can delete')), + ('can_change_advanced_settings', models.BooleanField(default=False, verbose_name='can change advanced settings')), + ('can_publish', models.BooleanField(default=True, verbose_name='can publish')), + ('can_change_permissions', models.BooleanField(default=False, help_text='on page level', verbose_name='can change permissions')), + ('can_move_page', models.BooleanField(default=True, verbose_name='can move')), + ('can_view', models.BooleanField(default=False, help_text='frontend view restriction', verbose_name='view restricted')), + ('can_recover_page', models.BooleanField(default=True, help_text='can recover any deleted page', verbose_name='can recover pages')), + ('group', models.ForeignKey(null=True, to='auth.Group', verbose_name='group', blank=True)), + ('sites', models.ManyToManyField(null=True, help_text='If none selected, user haves granted permissions to all sites.', blank=True, to='sites.Site', verbose_name='sites')), + ('user', models.ForeignKey(null=True, to=settings.AUTH_USER_MODEL, verbose_name='user', blank=True)), ], options={ 'verbose_name': 'Page global permission', @@ -77,59 +75,59 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Page', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), - ('created_by', models.CharField(editable=False, verbose_name='created by', max_length=70)), - ('changed_by', models.CharField(editable=False, verbose_name='changed by', max_length=70)), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), + ('created_by', models.CharField(max_length=70, verbose_name='created by', editable=False)), + ('changed_by', models.CharField(max_length=70, verbose_name='changed by', editable=False)), ('creation_date', models.DateTimeField(auto_now_add=True)), ('changed_date', models.DateTimeField(auto_now=True)), - ('publication_date', models.DateTimeField(help_text='When the page should go live. Status must be "Published" for page to go live.', blank=True, db_index=True, null=True, verbose_name='publication date')), - ('publication_end_date', models.DateTimeField(help_text='When to expire the page. Leave empty to never expire.', blank=True, db_index=True, null=True, verbose_name='publication end date')), - ('in_navigation', models.BooleanField(verbose_name='in navigation', db_index=True, default=True)), - ('soft_root', models.BooleanField(help_text='All ancestors will not be displayed in the navigation', db_index=True, default=False, verbose_name='soft root')), - ('reverse_id', models.CharField(help_text='A unique identifier that is used with the page_url templatetag for linking to this page', blank=True, max_length=40, verbose_name='id', db_index=True, null=True)), - ('navigation_extenders', models.CharField(verbose_name='attached menu', blank=True, null=True, max_length=80, db_index=True)), - ('template', models.CharField(help_text='The template used to render the content.', choices=[('col_two.html', 'two columns'), ('col_three.html', 'three columns'), ('nav_playground.html', 'navigation examples'), ('simple.html', 'simple'), ('static.html', 'static placeholders'), ('INHERIT', 'Inherit the template of the nearest ancestor')], default='INHERIT', max_length=100, verbose_name='template')), - ('login_required', models.BooleanField(verbose_name='login required', default=False)), - ('limit_visibility_in_menu', models.SmallIntegerField(help_text='limit when this page is visible in the menu', blank=True, choices=[(1, 'for logged in users only'), (2, 'for anonymous users only')], verbose_name='menu visibility', db_index=True, default=None, null=True)), - ('is_home', models.BooleanField(editable=False, db_index=True, default=False)), - ('application_urls', models.CharField(verbose_name='application', blank=True, null=True, max_length=200, db_index=True)), - ('application_namespace', models.CharField(verbose_name='application instance name', blank=True, null=True, max_length=200)), - ('level', models.PositiveIntegerField(editable=False, db_index=True)), - ('lft', models.PositiveIntegerField(editable=False, db_index=True)), - ('rght', models.PositiveIntegerField(editable=False, db_index=True)), - ('tree_id', models.PositiveIntegerField(editable=False, db_index=True)), - ('publisher_is_draft', models.BooleanField(editable=False, db_index=True, default=True)), - ('languages', models.CharField(editable=False, blank=True, null=True, max_length=255)), - ('revision_id', models.PositiveIntegerField(editable=False, default=0)), - ('xframe_options', models.IntegerField(choices=[(0, 'Inherit from parent page'), (1, 'Deny'), (2, 'Only this website'), (3, 'Allow')], default=0)), - ('parent', models.ForeignKey(related_name='children', blank=True, to='cms.Page', null=True)), - ('publisher_public', models.OneToOneField(related_name='publisher_draft', editable=False, to='cms.Page', null=True)), - ('site', models.ForeignKey(help_text='The site the page is accessible at.', related_name='djangocms_pages', verbose_name='site', to='sites.Site')), + ('publication_date', models.DateTimeField(db_index=True, null=True, help_text='When the page should go live. Status must be "Published" for page to go live.', blank=True, verbose_name='publication date')), + ('publication_end_date', models.DateTimeField(db_index=True, null=True, help_text='When to expire the page. Leave empty to never expire.', blank=True, verbose_name='publication end date')), + ('in_navigation', models.BooleanField(db_index=True, default=True, verbose_name='in navigation')), + ('soft_root', models.BooleanField(db_index=True, default=False, help_text='All ancestors will not be displayed in the navigation', verbose_name='soft root')), + ('reverse_id', models.CharField(db_index=True, max_length=40, verbose_name='id', null=True, help_text='A unique identifier that is used with the page_url templatetag for linking to this page', blank=True)), + ('navigation_extenders', models.CharField(db_index=True, max_length=80, blank=True, verbose_name='attached menu', null=True)), + ('template', models.CharField(max_length=100, default='INHERIT', help_text='The template used to render the content.', verbose_name='template', choices=[('col_two.html', 'two columns'), ('col_three.html', 'three columns'), ('nav_playground.html', 'navigation examples'), ('simple.html', 'simple'), ('static.html', 'static placeholders'), ('INHERIT', 'Inherit the template of the nearest ancestor')])), + ('login_required', models.BooleanField(default=False, verbose_name='login required')), + ('limit_visibility_in_menu', models.SmallIntegerField(db_index=True, default=None, verbose_name='menu visibility', null=True, choices=[(1, 'for logged in users only'), (2, 'for anonymous users only')], help_text='limit when this page is visible in the menu', blank=True)), + ('is_home', models.BooleanField(db_index=True, default=False, editable=False)), + ('application_urls', models.CharField(db_index=True, max_length=200, blank=True, verbose_name='application', null=True)), + ('application_namespace', models.CharField(max_length=200, null=True, blank=True, verbose_name='application instance name')), + ('level', models.PositiveIntegerField(db_index=True, editable=False)), + ('lft', models.PositiveIntegerField(db_index=True, editable=False)), + ('rght', models.PositiveIntegerField(db_index=True, editable=False)), + ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)), + ('publisher_is_draft', models.BooleanField(db_index=True, default=True, editable=False)), + ('languages', models.CharField(max_length=255, null=True, blank=True, editable=False)), + ('revision_id', models.PositiveIntegerField(default=0, editable=False)), + ('xframe_options', models.IntegerField(default=0, choices=[(0, 'Inherit from parent page'), (1, 'Deny'), (2, 'Only this website'), (3, 'Allow')])), + ('parent', models.ForeignKey(null=True, to='cms.Page', related_name='children', blank=True)), + ('publisher_public', models.OneToOneField(null=True, to='cms.Page', related_name='publisher_draft', editable=False)), + ('site', models.ForeignKey(to='sites.Site', verbose_name='site', related_name='djangocms_pages', help_text='The site the page is accessible at.')), ], options={ - 'verbose_name': 'page', - 'verbose_name_plural': 'pages', 'ordering': ('tree_id', 'lft'), 'permissions': (('view_page', 'Can view page'), ('publish_page', 'Can publish page'), ('edit_static_placeholder', 'Can edit static placeholders')), + 'verbose_name_plural': 'pages', + 'verbose_name': 'page', }, bases=(models.Model,), ), migrations.CreateModel( name='PagePermission', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), - ('can_change', models.BooleanField(verbose_name='can edit', default=True)), - ('can_add', models.BooleanField(verbose_name='can add', default=True)), - ('can_delete', models.BooleanField(verbose_name='can delete', default=True)), - ('can_change_advanced_settings', models.BooleanField(verbose_name='can change advanced settings', default=False)), - ('can_publish', models.BooleanField(verbose_name='can publish', default=True)), - ('can_change_permissions', models.BooleanField(help_text='on page level', default=False, verbose_name='can change permissions')), - ('can_move_page', models.BooleanField(verbose_name='can move', default=True)), - ('can_view', models.BooleanField(help_text='frontend view restriction', default=False, verbose_name='view restricted')), - ('grant_on', models.IntegerField(verbose_name='Grant on', default=5, choices=[(1, 'Current page'), (2, 'Page children (immediate)'), (3, 'Page and children (immediate)'), (4, 'Page descendants'), (5, 'Page and descendants')])), - ('group', models.ForeignKey(blank=True, verbose_name='group', to='auth.Group', null=True)), - ('page', models.ForeignKey(blank=True, verbose_name='page', to='cms.Page', null=True)), - ('user', models.ForeignKey(blank=True, verbose_name='user', to=settings.AUTH_USER_MODEL, null=True)), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), + ('can_change', models.BooleanField(default=True, verbose_name='can edit')), + ('can_add', models.BooleanField(default=True, verbose_name='can add')), + ('can_delete', models.BooleanField(default=True, verbose_name='can delete')), + ('can_change_advanced_settings', models.BooleanField(default=False, verbose_name='can change advanced settings')), + ('can_publish', models.BooleanField(default=True, verbose_name='can publish')), + ('can_change_permissions', models.BooleanField(default=False, help_text='on page level', verbose_name='can change permissions')), + ('can_move_page', models.BooleanField(default=True, verbose_name='can move')), + ('can_view', models.BooleanField(default=False, help_text='frontend view restriction', verbose_name='view restricted')), + ('grant_on', models.IntegerField(default=5, verbose_name='Grant on', choices=[(1, 'Current page'), (2, 'Page children (immediate)'), (3, 'Page and children (immediate)'), (4, 'Page descendants'), (5, 'Page and descendants')])), + ('group', models.ForeignKey(null=True, to='auth.Group', verbose_name='group', blank=True)), + ('page', models.ForeignKey(null=True, to='cms.Page', verbose_name='page', blank=True)), + ('user', models.ForeignKey(null=True, to=settings.AUTH_USER_MODEL, verbose_name='user', blank=True)), ], options={ 'verbose_name': 'Page permission', @@ -137,136 +135,4 @@ class Migration(migrations.Migration): }, bases=(models.Model,), ), - migrations.CreateModel( - name='PageUser', - fields=[ - ('user_ptr', models.OneToOneField(serialize=False, parent_link=True, auto_created=True, to=settings.AUTH_USER_MODEL, primary_key=True)), - ('created_by', models.ForeignKey(related_name='created_users', to=settings.AUTH_USER_MODEL)), - ], - options={ - 'verbose_name': 'User (page)', - 'verbose_name_plural': 'Users (page)', - }, - bases=('auth.user',), - ), - migrations.CreateModel( - name='PageUserGroup', - fields=[ - ('group_ptr', models.OneToOneField(serialize=False, parent_link=True, auto_created=True, to='auth.Group', primary_key=True)), - ('created_by', models.ForeignKey(related_name='created_usergroups', to=settings.AUTH_USER_MODEL)), - ], - options={ - 'verbose_name': 'User group (page)', - 'verbose_name_plural': 'User groups (page)', - }, - bases=('auth.group',), - ), - migrations.CreateModel( - name='Placeholder', - fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), - ('slot', models.CharField(editable=False, verbose_name='slot', db_index=True, max_length=50)), - ('default_width', models.PositiveSmallIntegerField(editable=False, verbose_name='width', null=True)), - ], - options={ - }, - bases=(models.Model,), - ), - migrations.AddField( - model_name='page', - name='placeholders', - field=models.ManyToManyField(editable=False, to='cms.Placeholder'), - preserve_default=True, - ), - migrations.AlterUniqueTogether( - name='page', - unique_together=set([('publisher_is_draft', 'application_namespace'), ('reverse_id', 'site', 'publisher_is_draft')]), - ), - migrations.AddField( - model_name='cmsplugin', - name='placeholder', - field=models.ForeignKey(editable=False, to='cms.Placeholder', null=True), - preserve_default=True, - ), - migrations.AddField( - model_name='aliaspluginmodel', - name='alias_placeholder', - field=models.ForeignKey(related_name='alias_placeholder', editable=False, to='cms.Placeholder', null=True), - preserve_default=True, - ), - migrations.CreateModel( - name='PlaceholderReference', - fields=[ - ('cmsplugin_ptr', models.OneToOneField(serialize=False, parent_link=True, auto_created=True, to='cms.CMSPlugin', primary_key=True)), - ('name', models.CharField(max_length=255)), - ('placeholder_ref', cms.models.fields.PlaceholderField(editable=False, to='cms.Placeholder', null=True, slotname='clipboard')), - ], - options={ - }, - bases=('cms.cmsplugin',), - ), - migrations.CreateModel( - name='StaticPlaceholder', - fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), - ('name', models.CharField(help_text='Descriptive name to identify this static placeholder. Not displayed to users.', blank=True, default='', max_length=255, verbose_name='static placeholder name')), - ('code', models.CharField(help_text='To render the static placeholder in templates.', blank=True, max_length=255, verbose_name='placeholder code')), - ('dirty', models.BooleanField(editable=False, default=False)), - ('creation_method', models.CharField(verbose_name='creation_method', blank=True, default='code', max_length=20, choices=[('template', 'by template'), ('code', 'by code')])), - ('draft', cms.models.fields.PlaceholderField(related_name='static_draft', editable=False, verbose_name='placeholder content', to='cms.Placeholder', null=True, slotname=cms.models.static_placeholder.static_slotname)), - ('public', cms.models.fields.PlaceholderField(related_name='static_public', editable=False, to='cms.Placeholder', null=True, slotname=cms.models.static_placeholder.static_slotname)), - ('site', models.ForeignKey(blank=True, to='sites.Site', null=True)), - ], - options={ - 'verbose_name': 'static placeholder', - 'verbose_name_plural': 'static placeholders', - }, - bases=(models.Model,), - ), - migrations.AlterUniqueTogether( - name='staticplaceholder', - unique_together=set([('code', 'site')]), - ), - migrations.CreateModel( - name='Title', - fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), - ('language', models.CharField(verbose_name='language', db_index=True, max_length=15)), - ('title', models.CharField(verbose_name='title', max_length=255)), - ('page_title', models.CharField(help_text='overwrite the title (html title tag)', blank=True, null=True, max_length=255, verbose_name='title')), - ('menu_title', models.CharField(help_text='overwrite the title in the menu', blank=True, null=True, max_length=255, verbose_name='title')), - ('meta_description', models.TextField(help_text='The text displayed in search engines.', blank=True, null=True, max_length=155, verbose_name='description')), - ('slug', models.SlugField(verbose_name='slug', max_length=255)), - ('path', models.CharField(verbose_name='Path', db_index=True, max_length=255)), - ('has_url_overwrite', models.BooleanField(editable=False, verbose_name='has URL overwrite', db_index=True, default=False)), - ('redirect', models.CharField(verbose_name='redirect', blank=True, null=True, max_length=255)), - ('creation_date', models.DateTimeField(editable=False, verbose_name='creation date', default=django.utils.timezone.now)), - ('published', models.BooleanField(verbose_name='is published', default=False)), - ('publisher_is_draft', models.BooleanField(editable=False, db_index=True, default=True)), - ('publisher_state', models.SmallIntegerField(editable=False, db_index=True, default=0)), - ('page', models.ForeignKey(related_name='title_set', verbose_name='page', to='cms.Page')), - ('publisher_public', models.OneToOneField(related_name='publisher_draft', editable=False, to='cms.Title', null=True)), - ], - options={ - }, - bases=(models.Model,), - ), - migrations.AlterUniqueTogether( - name='title', - unique_together=set([('language', 'page')]), - ), - migrations.CreateModel( - name='UserSettings', - fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), - ('language', models.CharField(help_text='The language for the admin interface and toolbar', choices=[('en', 'English'), ('fr', 'French'), ('de', 'German'), ('pt-br', 'Brazilian Portuguese'), ('nl', 'Dutch'), ('es-mx', 'Español')], max_length=10, verbose_name='Language')), - ('clipboard', models.ForeignKey(blank=True, editable=False, to='cms.Placeholder', null=True)), - ('user', models.ForeignKey(related_name='djangocms_usersettings', editable=False, unique=True, to=settings.AUTH_USER_MODEL)), - ], - options={ - 'verbose_name': 'user setting', - 'verbose_name_plural': 'user settings', - }, - bases=(models.Model,), - ), ] diff --git a/cms/migrations_django/0002_auto_20140816_1918.py b/cms/migrations_django/0002_auto_20140816_1918.py new file mode 100644 index 00000000000..90898f9ed00 --- /dev/null +++ b/cms/migrations_django/0002_auto_20140816_1918.py @@ -0,0 +1,162 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import cms.models.static_placeholder +import cms.models.fields +from django.conf import settings +import django.utils.timezone +try: + from django.contrib.auth import get_user_model +except ImportError: # django < 1.5 + from django.contrib.auth.models import User +else: + User = get_user_model() +user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) +user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) +user_ptr_name = '%s_ptr' % User._meta.object_name.lower() + + +class Migration(migrations.Migration): + + dependencies = [ + ('auth', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('cms', '0001_initial'), + ('sites', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='PageUser', + fields=[ + (user_ptr_name, models.OneToOneField(primary_key=True, to=settings.AUTH_USER_MODEL, auto_created=True, parent_link=True, serialize=False)), + ('created_by', models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='created_users')), + ], + options={ + 'verbose_name': 'User (page)', + 'verbose_name_plural': 'Users (page)', + }, + bases=(user_model_label,), + ), + migrations.CreateModel( + name='PageUserGroup', + fields=[ + ('group_ptr', models.OneToOneField(primary_key=True, to='auth.Group', auto_created=True, parent_link=True, serialize=False)), + ('created_by', models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='created_usergroups')), + ], + options={ + 'verbose_name': 'User group (page)', + 'verbose_name_plural': 'User groups (page)', + }, + bases=('auth.group',), + ), + migrations.CreateModel( + name='Placeholder', + fields=[ + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), + ('slot', models.CharField(db_index=True, max_length=50, verbose_name='slot', editable=False)), + ('default_width', models.PositiveSmallIntegerField(null=True, verbose_name='width', editable=False)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.AddField( + model_name='page', + name='placeholders', + field=models.ManyToManyField(to='cms.Placeholder', editable=False), + preserve_default=True, + ), + migrations.AlterUniqueTogether( + name='page', + unique_together=set([('publisher_is_draft', 'application_namespace'), ('reverse_id', 'site', 'publisher_is_draft')]), + ), + migrations.AddField( + model_name='cmsplugin', + name='placeholder', + field=models.ForeignKey(null=True, to='cms.Placeholder', editable=False), + preserve_default=True, + ), + migrations.AddField( + model_name='aliaspluginmodel', + name='alias_placeholder', + field=models.ForeignKey(null=True, to='cms.Placeholder', related_name='alias_placeholder', editable=False), + preserve_default=True, + ), + migrations.CreateModel( + name='PlaceholderReference', + fields=[ + ('cmsplugin_ptr', models.OneToOneField(primary_key=True, to='cms.CMSPlugin', auto_created=True, parent_link=True, serialize=False)), + ('name', models.CharField(max_length=255)), + ('placeholder_ref', cms.models.fields.PlaceholderField(null=True, to='cms.Placeholder', slotname='clipboard', editable=False)), + ], + options={ + }, + bases=('cms.cmsplugin',), + ), + migrations.CreateModel( + name='StaticPlaceholder', + fields=[ + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), + ('name', models.CharField(max_length=255, default='', help_text='Descriptive name to identify this static placeholder. Not displayed to users.', blank=True, verbose_name='static placeholder name')), + ('code', models.CharField(max_length=255, verbose_name='placeholder code', help_text='To render the static placeholder in templates.', blank=True)), + ('dirty', models.BooleanField(default=False, editable=False)), + ('creation_method', models.CharField(max_length=20, default='code', blank=True, verbose_name='creation_method', choices=[('template', 'by template'), ('code', 'by code')])), + ('draft', cms.models.fields.PlaceholderField(null=True, to='cms.Placeholder', verbose_name='placeholder content', related_name='static_draft', slotname=cms.models.static_placeholder.static_slotname, editable=False)), + ('public', cms.models.fields.PlaceholderField(null=True, to='cms.Placeholder', slotname=cms.models.static_placeholder.static_slotname, related_name='static_public', editable=False)), + ('site', models.ForeignKey(null=True, to='sites.Site', blank=True)), + ], + options={ + 'verbose_name': 'static placeholder', + 'verbose_name_plural': 'static placeholders', + }, + bases=(models.Model,), + ), + migrations.AlterUniqueTogether( + name='staticplaceholder', + unique_together=set([('code', 'site')]), + ), + migrations.CreateModel( + name='Title', + fields=[ + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), + ('language', models.CharField(db_index=True, max_length=15, verbose_name='language')), + ('title', models.CharField(max_length=255, verbose_name='title')), + ('page_title', models.CharField(max_length=255, null=True, help_text='overwrite the title (html title tag)', blank=True, verbose_name='title')), + ('menu_title', models.CharField(max_length=255, null=True, help_text='overwrite the title in the menu', blank=True, verbose_name='title')), + ('meta_description', models.TextField(max_length=155, null=True, help_text='The text displayed in search engines.', blank=True, verbose_name='description')), + ('slug', models.SlugField(max_length=255, verbose_name='slug')), + ('path', models.CharField(db_index=True, max_length=255, verbose_name='Path')), + ('has_url_overwrite', models.BooleanField(db_index=True, default=False, editable=False, verbose_name='has URL overwrite')), + ('redirect', models.CharField(max_length=255, null=True, blank=True, verbose_name='redirect')), + ('creation_date', models.DateTimeField(default=django.utils.timezone.now, verbose_name='creation date', editable=False)), + ('published', models.BooleanField(default=False, verbose_name='is published')), + ('publisher_is_draft', models.BooleanField(db_index=True, default=True, editable=False)), + ('publisher_state', models.SmallIntegerField(db_index=True, default=0, editable=False)), + ('page', models.ForeignKey(to='cms.Page', verbose_name='page', related_name='title_set')), + ('publisher_public', models.OneToOneField(null=True, to='cms.Title', related_name='publisher_draft', editable=False)), + ], + options={ + }, + bases=(models.Model,), + ), + migrations.AlterUniqueTogether( + name='title', + unique_together=set([('language', 'page')]), + ), + migrations.CreateModel( + name='UserSettings', + fields=[ + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), + ('language', models.CharField(max_length=10, choices=[('en', 'English'), ('fr', 'French'), ('de', 'German'), ('pt-br', 'Brazilian Portuguese'), ('nl', 'Dutch'), ('es-mx', 'Español')], help_text='The language for the admin interface and toolbar', verbose_name='Language')), + ('clipboard', models.ForeignKey(null=True, to='cms.Placeholder', blank=True, editable=False)), + ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, unique=True, related_name='djangocms_usersettings', editable=False)), + ], + options={ + 'verbose_name': 'user setting', + 'verbose_name_plural': 'user settings', + }, + bases=(models.Model,), + ), + ] diff --git a/cms/test_utils/cli.py b/cms/test_utils/cli.py index 9d6a6619ca2..7804d7aed6b 100644 --- a/cms/test_utils/cli.py +++ b/cms/test_utils/cli.py @@ -288,6 +288,7 @@ def configure(db_url, **extra): 'fileapp': 'cms.test_utils.project.fileapp.migrations_django', 'placeholderapp': 'cms.test_utils.project.placeholderapp.migrations_django', 'sampleapp': 'cms.test_utils.project.sampleapp.migrations_django', + 'emailuserapp': 'cms.test_utils.project.emailuserapp.migrations_django', 'fakemlng': 'cms.test_utils.project.fakemlng.migrations_django', 'extra_context': 'cms.test_utils.project.pluginapp.plugins.extra_context.migrations_django', 'one_thing': 'cms.test_utils.project.pluginapp.plugins.one_thing.migrations_django', diff --git a/cms/test_utils/project/bunch_of_plugins/migrations_django/0001_initial.py b/cms/test_utils/project/bunch_of_plugins/migrations_django/0001_initial.py index 3f20d69860e..b274d9b4676 100644 --- a/cms/test_utils/project/bunch_of_plugins/migrations_django/0001_initial.py +++ b/cms/test_utils/project/bunch_of_plugins/migrations_django/0001_initial.py @@ -15,7 +15,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='TestPlugin1', fields=[ - ('cmsplugin_ptr', models.OneToOneField(serialize=False, parent_link=True, auto_created=True, to='cms.CMSPlugin', primary_key=True)), + ('cmsplugin_ptr', models.OneToOneField(primary_key=True, to='cms.CMSPlugin', auto_created=True, parent_link=True, serialize=False)), ], options={ 'abstract': False, @@ -25,7 +25,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='TestPlugin2', fields=[ - ('cmsplugin_ptr', models.OneToOneField(serialize=False, parent_link=True, auto_created=True, to='cms.CMSPlugin', primary_key=True)), + ('cmsplugin_ptr', models.OneToOneField(primary_key=True, to='cms.CMSPlugin', auto_created=True, parent_link=True, serialize=False)), ], options={ 'abstract': False, diff --git a/cms/test_utils/project/emailuserapp/migrations_django/0001_initial.py b/cms/test_utils/project/emailuserapp/migrations_django/0001_initial.py new file mode 100644 index 00000000000..46dda4c19ce --- /dev/null +++ b/cms/test_utils/project/emailuserapp/migrations_django/0001_initial.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('auth', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='EmailUser', + fields=[ + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), + ('password', models.CharField(max_length=128, verbose_name='password')), + ('last_login', models.DateTimeField(default=django.utils.timezone.now, verbose_name='last login')), + ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), + ('email', models.EmailField(max_length=75, verbose_name='email address', help_text='Required. Standard format email address.', unique=True, blank=True)), + ('first_name', models.CharField(max_length=30, verbose_name='first name', blank=True)), + ('last_name', models.CharField(max_length=30, verbose_name='last name', blank=True)), + ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), + ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), + ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('groups', models.ManyToManyField(related_query_name='user', to='auth.Group', verbose_name='groups', related_name='user_set', help_text='The groups this user belongs to. A user will get all permissions granted to each of his/her group.', blank=True)), + ('user_permissions', models.ManyToManyField(related_query_name='user', to='auth.Permission', verbose_name='user permissions', related_name='user_set', help_text='Specific permissions for this user.', blank=True)), + ], + options={ + 'abstract': False, + 'verbose_name': 'user', + 'verbose_name_plural': 'users', + }, + bases=(models.Model,), + ), + ] diff --git a/cms/test_utils/project/emailuserapp/migrations_django/__init__.py b/cms/test_utils/project/emailuserapp/migrations_django/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/cms/test_utils/project/extensionapp/migrations_django/0001_initial.py b/cms/test_utils/project/extensionapp/migrations_django/0001_initial.py index fccdc1281d4..3e48c2b22b2 100644 --- a/cms/test_utils/project/extensionapp/migrations_django/0001_initial.py +++ b/cms/test_utils/project/extensionapp/migrations_django/0001_initial.py @@ -8,19 +8,19 @@ class Migration(migrations.Migration): dependencies = [ - ('cms', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('cms', '0002_auto_20140816_1918'), ] operations = [ migrations.CreateModel( name='MyPageExtension', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), - ('extra', models.CharField(blank=True, default='', max_length=255)), - ('extended_object', models.OneToOneField(editable=False, to='cms.Page')), - ('favorite_users', models.ManyToManyField(blank=True, null=True, to=settings.AUTH_USER_MODEL)), - ('public_extension', models.OneToOneField(related_name='draft_extension', editable=False, to='extensionapp.MyPageExtension', null=True)), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), + ('extra', models.CharField(max_length=255, default='', blank=True)), + ('extended_object', models.OneToOneField(to='cms.Page', editable=False)), + ('favorite_users', models.ManyToManyField(null=True, to=settings.AUTH_USER_MODEL, blank=True)), + ('public_extension', models.OneToOneField(null=True, to='extensionapp.MyPageExtension', related_name='draft_extension', editable=False)), ], options={ 'abstract': False, @@ -30,10 +30,10 @@ class Migration(migrations.Migration): migrations.CreateModel( name='MyTitleExtension', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), - ('extra_title', models.CharField(blank=True, default='', max_length=255)), - ('extended_object', models.OneToOneField(editable=False, to='cms.Title')), - ('public_extension', models.OneToOneField(related_name='draft_extension', editable=False, to='extensionapp.MyTitleExtension', null=True)), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), + ('extra_title', models.CharField(max_length=255, default='', blank=True)), + ('extended_object', models.OneToOneField(to='cms.Title', editable=False)), + ('public_extension', models.OneToOneField(null=True, to='extensionapp.MyTitleExtension', related_name='draft_extension', editable=False)), ], options={ 'abstract': False, diff --git a/cms/test_utils/project/fakemlng/migrations_django/0001_initial.py b/cms/test_utils/project/fakemlng/migrations_django/0001_initial.py index 10a826300ed..6ed7c84b439 100644 --- a/cms/test_utils/project/fakemlng/migrations_django/0001_initial.py +++ b/cms/test_utils/project/fakemlng/migrations_django/0001_initial.py @@ -8,14 +8,14 @@ class Migration(migrations.Migration): dependencies = [ - ('cms', '0001_initial'), + ('cms', '0002_auto_20140816_1918'), ] operations = [ migrations.CreateModel( name='MainModel', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), ], options={ }, @@ -24,10 +24,10 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Translations', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), ('language_code', models.CharField(db_index=True, max_length=15)), ('master', models.ForeignKey(to='fakemlng.MainModel')), - ('placeholder', cms.models.fields.PlaceholderField(editable=False, to='cms.Placeholder', null=True, slotname='translated')), + ('placeholder', cms.models.fields.PlaceholderField(null=True, to='cms.Placeholder', slotname='translated', editable=False)), ], options={ }, diff --git a/cms/test_utils/project/fileapp/migrations_django/0001_initial.py b/cms/test_utils/project/fileapp/migrations_django/0001_initial.py index 0d88cf1f17b..f8d3032bb36 100644 --- a/cms/test_utils/project/fileapp/migrations_django/0001_initial.py +++ b/cms/test_utils/project/fileapp/migrations_django/0001_initial.py @@ -13,8 +13,8 @@ class Migration(migrations.Migration): migrations.CreateModel( name='FileModel', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), - ('test_file', models.FileField(blank=True, null=True, upload_to='fileapp/')), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), + ('test_file', models.FileField(null=True, blank=True, upload_to='fileapp/')), ], options={ }, diff --git a/cms/test_utils/project/objectpermissionsapp/migrations_django/0001_initial.py b/cms/test_utils/project/objectpermissionsapp/migrations_django/0001_initial.py index 23abd7bd189..bae35e36b2f 100644 --- a/cms/test_utils/project/objectpermissionsapp/migrations_django/0001_initial.py +++ b/cms/test_utils/project/objectpermissionsapp/migrations_django/0001_initial.py @@ -9,16 +9,16 @@ class Migration(migrations.Migration): dependencies = [ ('auth', '0001_initial'), - ('contenttypes', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('contenttypes', '0001_initial'), ] operations = [ migrations.CreateModel( name='UserObjectPermission', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), - ('object_pk', models.CharField(verbose_name='object ID', max_length=255)), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), + ('object_pk', models.CharField(max_length=255, verbose_name='object ID')), ('content_type', models.ForeignKey(to='contenttypes.ContentType')), ('permission', models.ForeignKey(to='auth.Permission')), ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)), diff --git a/cms/test_utils/project/placeholderapp/migrations_django/0001_initial.py b/cms/test_utils/project/placeholderapp/migrations_django/0001_initial.py index 2896dc02077..544225e1183 100644 --- a/cms/test_utils/project/placeholderapp/migrations_django/0001_initial.py +++ b/cms/test_utils/project/placeholderapp/migrations_django/0001_initial.py @@ -9,18 +9,18 @@ class Migration(migrations.Migration): dependencies = [ - ('cms', '0001_initial'), + ('cms', '0002_auto_20140816_1918'), ] operations = [ migrations.CreateModel( name='DynamicPlaceholderSlotExample', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), - ('char_1', models.CharField(verbose_name='char_1', max_length=255)), - ('char_2', models.CharField(verbose_name='char_2', max_length=255)), - ('placeholder_1', cms.models.fields.PlaceholderField(related_name='dynamic_pl_1', editable=False, to='cms.Placeholder', null=True, slotname=cms.test_utils.project.placeholderapp.models.dynamic_placeholder_1)), - ('placeholder_2', cms.models.fields.PlaceholderField(related_name='dynamic_pl_2', editable=False, to='cms.Placeholder', null=True, slotname=cms.test_utils.project.placeholderapp.models.dynamic_placeholder_2)), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), + ('char_1', models.CharField(max_length=255, verbose_name='char_1')), + ('char_2', models.CharField(max_length=255, verbose_name='char_2')), + ('placeholder_1', cms.models.fields.PlaceholderField(null=True, to='cms.Placeholder', slotname=cms.test_utils.project.placeholderapp.models.dynamic_placeholder_1, related_name='dynamic_pl_1', editable=False)), + ('placeholder_2', cms.models.fields.PlaceholderField(null=True, to='cms.Placeholder', slotname=cms.test_utils.project.placeholderapp.models.dynamic_placeholder_2, related_name='dynamic_pl_2', editable=False)), ], options={ }, @@ -29,13 +29,13 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Example1', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), - ('char_1', models.CharField(verbose_name='char_1', max_length=255)), - ('char_2', models.CharField(verbose_name='char_2', max_length=255)), - ('char_3', models.CharField(verbose_name='char_3', max_length=255)), - ('char_4', models.CharField(verbose_name='char_4', max_length=255)), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), + ('char_1', models.CharField(max_length=255, verbose_name='char_1')), + ('char_2', models.CharField(max_length=255, verbose_name='char_2')), + ('char_3', models.CharField(max_length=255, verbose_name='char_3')), + ('char_4', models.CharField(max_length=255, verbose_name='char_4')), ('date_field', models.DateField(null=True)), - ('placeholder', cms.models.fields.PlaceholderField(editable=False, to='cms.Placeholder', null=True, slotname='placeholder')), + ('placeholder', cms.models.fields.PlaceholderField(null=True, to='cms.Placeholder', slotname='placeholder', editable=False)), ], options={ }, @@ -44,8 +44,8 @@ class Migration(migrations.Migration): migrations.CreateModel( name='MultilingualExample1', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), - ('placeholder_1', cms.models.fields.PlaceholderField(editable=False, to='cms.Placeholder', null=True, slotname='placeholder_1')), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), + ('placeholder_1', cms.models.fields.PlaceholderField(null=True, to='cms.Placeholder', slotname='placeholder_1', editable=False)), ], options={ 'abstract': False, @@ -55,11 +55,11 @@ class Migration(migrations.Migration): migrations.CreateModel( name='MultilingualExample1Translation', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), - ('char_1', models.CharField(verbose_name='char_1', max_length=255)), - ('char_2', models.CharField(verbose_name='char_2', max_length=255)), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), + ('char_1', models.CharField(max_length=255, verbose_name='char_1')), + ('char_2', models.CharField(max_length=255, verbose_name='char_2')), ('language_code', models.CharField(db_index=True, max_length=15)), - ('master', models.ForeignKey(related_name='translations', editable=False, to='placeholderapp.MultilingualExample1', null=True)), + ('master', models.ForeignKey(null=True, to='placeholderapp.MultilingualExample1', related_name='translations', editable=False)), ], options={ 'db_table': 'placeholderapp_multilingualexample1_translation', @@ -73,13 +73,13 @@ class Migration(migrations.Migration): migrations.CreateModel( name='TwoPlaceholderExample', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), - ('char_1', models.CharField(verbose_name='char_1', max_length=255)), - ('char_2', models.CharField(verbose_name='char_2', max_length=255)), - ('char_3', models.CharField(verbose_name='char_3', max_length=255)), - ('char_4', models.CharField(verbose_name='char_4', max_length=255)), - ('placeholder_1', cms.models.fields.PlaceholderField(related_name='p1', editable=False, to='cms.Placeholder', null=True, slotname='placeholder_1')), - ('placeholder_2', cms.models.fields.PlaceholderField(related_name='p2', editable=False, to='cms.Placeholder', null=True, slotname='placeholder_2')), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), + ('char_1', models.CharField(max_length=255, verbose_name='char_1')), + ('char_2', models.CharField(max_length=255, verbose_name='char_2')), + ('char_3', models.CharField(max_length=255, verbose_name='char_3')), + ('char_4', models.CharField(max_length=255, verbose_name='char_4')), + ('placeholder_1', cms.models.fields.PlaceholderField(null=True, to='cms.Placeholder', slotname='placeholder_1', related_name='p1', editable=False)), + ('placeholder_2', cms.models.fields.PlaceholderField(null=True, to='cms.Placeholder', slotname='placeholder_2', related_name='p2', editable=False)), ], options={ }, diff --git a/cms/test_utils/project/pluginapp/plugins/manytomany_rel/migrations_django/0001_initial.py b/cms/test_utils/project/pluginapp/plugins/manytomany_rel/migrations_django/0001_initial.py index b4ee4d19856..74ebabf7834 100644 --- a/cms/test_utils/project/pluginapp/plugins/manytomany_rel/migrations_django/0001_initial.py +++ b/cms/test_utils/project/pluginapp/plugins/manytomany_rel/migrations_django/0001_initial.py @@ -14,7 +14,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Article', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), ('title', models.CharField(max_length=50)), ], options={ @@ -24,7 +24,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='ArticlePluginModel', fields=[ - ('cmsplugin_ptr', models.OneToOneField(serialize=False, parent_link=True, auto_created=True, to='cms.CMSPlugin', primary_key=True)), + ('cmsplugin_ptr', models.OneToOneField(primary_key=True, to='cms.CMSPlugin', auto_created=True, parent_link=True, serialize=False)), ('title', models.CharField(max_length=50)), ], options={ @@ -35,7 +35,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Section', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), ('name', models.CharField(max_length=50)), ], options={ diff --git a/cms/test_utils/project/pluginapp/plugins/meta/migrations_django/0001_initial.py b/cms/test_utils/project/pluginapp/plugins/meta/migrations_django/0001_initial.py index afeae72f0a5..3fae387d8fe 100644 --- a/cms/test_utils/project/pluginapp/plugins/meta/migrations_django/0001_initial.py +++ b/cms/test_utils/project/pluginapp/plugins/meta/migrations_django/0001_initial.py @@ -14,7 +14,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='TestPluginModel', fields=[ - ('cmsplugin_ptr', models.OneToOneField(serialize=False, parent_link=True, auto_created=True, to='cms.CMSPlugin', primary_key=True)), + ('cmsplugin_ptr', models.OneToOneField(primary_key=True, to='cms.CMSPlugin', auto_created=True, parent_link=True, serialize=False)), ], options={ 'abstract': False, @@ -24,7 +24,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='TestPluginModel2', fields=[ - ('cmsplugin_ptr', models.OneToOneField(serialize=False, parent_link=True, auto_created=True, to='cms.CMSPlugin', primary_key=True)), + ('cmsplugin_ptr', models.OneToOneField(primary_key=True, to='cms.CMSPlugin', auto_created=True, parent_link=True, serialize=False)), ], options={ 'db_table': 'meta_testpluginmodel2', @@ -34,7 +34,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='TestPluginModel4', fields=[ - ('cmsplugin_ptr', models.OneToOneField(serialize=False, parent_link=True, auto_created=True, to='cms.CMSPlugin', primary_key=True)), + ('cmsplugin_ptr', models.OneToOneField(primary_key=True, to='cms.CMSPlugin', auto_created=True, parent_link=True, serialize=False)), ], options={ 'db_table': 'or_another_4', diff --git a/cms/test_utils/project/pluginapp/plugins/one_thing/migrations_django/0001_initial.py b/cms/test_utils/project/pluginapp/plugins/one_thing/migrations_django/0001_initial.py index c646c06c9ed..14eb39923f1 100644 --- a/cms/test_utils/project/pluginapp/plugins/one_thing/migrations_django/0001_initial.py +++ b/cms/test_utils/project/pluginapp/plugins/one_thing/migrations_django/0001_initial.py @@ -14,7 +14,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='TestPluginModel3', fields=[ - ('cmsplugin_ptr', models.OneToOneField(serialize=False, parent_link=True, auto_created=True, to='cms.CMSPlugin', primary_key=True)), + ('cmsplugin_ptr', models.OneToOneField(primary_key=True, to='cms.CMSPlugin', auto_created=True, parent_link=True, serialize=False)), ], options={ }, @@ -23,7 +23,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='TestPluginModel5', fields=[ - ('cmsplugin_ptr', models.OneToOneField(serialize=False, parent_link=True, auto_created=True, to='cms.CMSPlugin', primary_key=True)), + ('cmsplugin_ptr', models.OneToOneField(primary_key=True, to='cms.CMSPlugin', auto_created=True, parent_link=True, serialize=False)), ], options={ 'db_table': 'or_another_5', diff --git a/cms/test_utils/project/sampleapp/migrations_django/0001_initial.py b/cms/test_utils/project/sampleapp/migrations_django/0001_initial.py index 41c4ad51210..60148542a4a 100644 --- a/cms/test_utils/project/sampleapp/migrations_django/0001_initial.py +++ b/cms/test_utils/project/sampleapp/migrations_django/0001_initial.py @@ -8,21 +8,21 @@ class Migration(migrations.Migration): dependencies = [ - ('cms', '0001_initial'), + ('cms', '0002_auto_20140816_1918'), ] operations = [ migrations.CreateModel( name='Category', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), ('name', models.CharField(max_length=20)), - ('lft', models.PositiveIntegerField(editable=False, db_index=True)), - ('rght', models.PositiveIntegerField(editable=False, db_index=True)), - ('tree_id', models.PositiveIntegerField(editable=False, db_index=True)), - ('level', models.PositiveIntegerField(editable=False, db_index=True)), - ('description', cms.models.fields.PlaceholderField(editable=False, to='cms.Placeholder', null=True, slotname='category_description')), - ('parent', models.ForeignKey(blank=True, to='sampleapp.Category', null=True)), + ('lft', models.PositiveIntegerField(db_index=True, editable=False)), + ('rght', models.PositiveIntegerField(db_index=True, editable=False)), + ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)), + ('level', models.PositiveIntegerField(db_index=True, editable=False)), + ('description', cms.models.fields.PlaceholderField(null=True, to='cms.Placeholder', slotname='category_description', editable=False)), + ('parent', models.ForeignKey(null=True, to='sampleapp.Category', blank=True)), ], options={ 'verbose_name_plural': 'categories', @@ -32,7 +32,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Picture', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), ('image', models.ImageField(upload_to='pictures')), ('category', models.ForeignKey(to='sampleapp.Category')), ], diff --git a/develop.py b/develop.py index 9df362859e6..7df4b8a7711 100755 --- a/develop.py +++ b/develop.py @@ -189,7 +189,7 @@ def makemigrations(migrate_plugins=True, merge=False, squash=False): 'cms', 'menus', # testing applications 'meta', 'manytomany_rel', 'fileapp', 'placeholderapp', 'sampleapp', 'fakemlng', 'one_thing', 'extensionapp', - 'objectpermissionsapp', 'bunch_of_plugins', + 'objectpermissionsapp', 'bunch_of_plugins', 'emailuserapp' ] if migrate_plugins: applications.extend([ diff --git a/menus/migrations_django/0001_initial.py b/menus/migrations_django/0001_initial.py index e7babca18cc..772401fe7a5 100644 --- a/menus/migrations_django/0001_initial.py +++ b/menus/migrations_django/0001_initial.py @@ -13,7 +13,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='CacheKey', fields=[ - ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)), + ('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)), ('language', models.CharField(max_length=255)), ('site', models.PositiveIntegerField()), ('key', models.CharField(max_length=255)),