Skip to content

Commit

Permalink
Fix support for custom user models
Browse files Browse the repository at this point in the history
  • Loading branch information
yakky committed Aug 22, 2014
1 parent 4e943c0 commit cd86223
Show file tree
Hide file tree
Showing 17 changed files with 333 additions and 266 deletions.
268 changes: 67 additions & 201 deletions cms/migrations_django/0001_initial.py

Large diffs are not rendered by default.

162 changes: 162 additions & 0 deletions 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,),
),
]
1 change: 1 addition & 0 deletions cms/test_utils/cli.py
Expand Up @@ -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',
Expand Down
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
@@ -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,),
),
]
Empty file.
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
Expand Up @@ -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={
},
Expand All @@ -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={
},
Expand Down
Expand Up @@ -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={
},
Expand Down
Expand Up @@ -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)),
Expand Down

0 comments on commit cd86223

Please sign in to comment.