Возможно, починил миграцию

remotes/origin/upgrade-requirements
Alexander Kondratyev 9 years ago
parent 765721e2e0
commit c0c6f39f19
  1. 45
      packages/aldryn_people/migrations/0004_auto_20150622_1606.py
  2. 206
      packages/aldryn_segmentation/migrations/0001_initial.py
  3. 2
      packages/blog/migrations/0001_initial.py
  4. 20
      packages/blog/migrations/0010_auto_20170401_1032.py
  5. 113
      packages/cmsplugin_tabs/migrations/0001_initial.py
  6. 78
      packages/country_segment/migrations/0001_initial.py
  7. 1
      promo/fixtures/data.json
  8. 16
      promo/migrations/0001_initial.py
  9. 1
      trademark/fixtures/nice.json
  10. 24
      trademark/migrations/0001_initial.py

@ -2,12 +2,13 @@
from __future__ import unicode_literals
from django.db import models, migrations
import filer
class Migration(migrations.Migration):
dependencies = [
('aldryn_people', '0003_auto_20150425_2103'),
('filer', '0002_auto_20150606_2003'),
]
operations = [
@ -31,4 +32,46 @@ class Migration(migrations.Migration):
field=models.CharField(max_length=15, verbose_name='Language', db_index=True),
preserve_default=True,
),
migrations.RemoveField(
model_name='group',
name='address',
),
migrations.RemoveField(
model_name='group',
name='city',
),
migrations.RemoveField(
model_name='person',
name='name',
),
migrations.AddField(
model_name='grouptranslation',
name='address',
field=models.TextField(verbose_name='address', blank=True),
preserve_default=True,
),
migrations.AddField(
model_name='grouptranslation',
name='city',
field=models.CharField(max_length=255, verbose_name='city', blank=True),
preserve_default=True,
),
migrations.AddField(
model_name='person',
name='visual_portrait',
field=filer.fields.image.FilerImageField(related_name='visual_portrait', on_delete=models.deletion.SET_NULL, default=None, blank=True, to='filer.Image', null=True),
preserve_default=True,
),
migrations.AddField(
model_name='persontranslation',
name='name',
field=models.CharField(default='', max_length=255, verbose_name='name'),
preserve_default=False,
),
migrations.AlterField(
model_name='person',
name='visual',
field=filer.fields.image.FilerImageField(related_name='visual', on_delete=models.deletion.SET_NULL, default=None, blank=True, to='filer.Image', null=True),
preserve_default=True,
)
]

@ -1,125 +1,83 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
class Migration(SchemaMigration):
def forwards(self, orm):
# Adding model 'SegmentLimitPluginModel'
db.create_table(u'aldryn_segmentation_segmentlimitpluginmodel', (
(u'cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)),
('label', self.gf('django.db.models.fields.CharField')(default=u'', max_length=128, blank=True)),
('max_children', self.gf('django.db.models.fields.PositiveIntegerField')(default=1)),
))
db.send_create_signal(u'aldryn_segmentation', ['SegmentLimitPluginModel'])
# Adding model 'FallbackSegmentPluginModel'
db.create_table(u'aldryn_segmentation_fallbacksegmentpluginmodel', (
(u'cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)),
('label', self.gf('django.db.models.fields.CharField')(default=u'', max_length=128, blank=True)),
))
db.send_create_signal(u'aldryn_segmentation', ['FallbackSegmentPluginModel'])
# Adding model 'SwitchSegmentPluginModel'
db.create_table(u'aldryn_segmentation_switchsegmentpluginmodel', (
(u'cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)),
('label', self.gf('django.db.models.fields.CharField')(default=u'', max_length=128, blank=True)),
('on_off', self.gf('django.db.models.fields.BooleanField')(default=True)),
))
db.send_create_signal(u'aldryn_segmentation', ['SwitchSegmentPluginModel'])
# Adding model 'CookieSegmentPluginModel'
db.create_table(u'aldryn_segmentation_cookiesegmentpluginmodel', (
(u'cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)),
('label', self.gf('django.db.models.fields.CharField')(default=u'', max_length=128, blank=True)),
('cookie_key', self.gf('django.db.models.fields.CharField')(default=u'', max_length=4096)),
('cookie_value', self.gf('django.db.models.fields.CharField')(default=u'', max_length=4096)),
))
db.send_create_signal(u'aldryn_segmentation', ['CookieSegmentPluginModel'])
# Adding model 'AuthenticatedSegmentPluginModel'
db.create_table(u'aldryn_segmentation_authenticatedsegmentpluginmodel', (
(u'cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)),
('label', self.gf('django.db.models.fields.CharField')(default=u'', max_length=128, blank=True)),
))
db.send_create_signal(u'aldryn_segmentation', ['AuthenticatedSegmentPluginModel'])
def backwards(self, orm):
# Deleting model 'SegmentLimitPluginModel'
db.delete_table(u'aldryn_segmentation_segmentlimitpluginmodel')
# Deleting model 'FallbackSegmentPluginModel'
db.delete_table(u'aldryn_segmentation_fallbacksegmentpluginmodel')
# Deleting model 'SwitchSegmentPluginModel'
db.delete_table(u'aldryn_segmentation_switchsegmentpluginmodel')
# Deleting model 'CookieSegmentPluginModel'
db.delete_table(u'aldryn_segmentation_cookiesegmentpluginmodel')
# Deleting model 'AuthenticatedSegmentPluginModel'
db.delete_table(u'aldryn_segmentation_authenticatedsegmentpluginmodel')
models = {
u'aldryn_segmentation.authenticatedsegmentpluginmodel': {
'Meta': {'object_name': 'AuthenticatedSegmentPluginModel'},
u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}),
'label': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '128', 'blank': 'True'})
},
u'aldryn_segmentation.cookiesegmentpluginmodel': {
'Meta': {'object_name': 'CookieSegmentPluginModel'},
u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}),
'cookie_key': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '4096'}),
'cookie_value': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '4096'}),
'label': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '128', 'blank': 'True'})
},
u'aldryn_segmentation.fallbacksegmentpluginmodel': {
'Meta': {'object_name': 'FallbackSegmentPluginModel'},
u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}),
'label': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '128', 'blank': 'True'})
},
u'aldryn_segmentation.segment': {
'Meta': {'object_name': 'Segment', 'managed': 'False'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
},
u'aldryn_segmentation.segmentlimitpluginmodel': {
'Meta': {'object_name': 'SegmentLimitPluginModel', '_ormbases': ['cms.CMSPlugin']},
u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}),
'label': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '128', 'blank': 'True'}),
'max_children': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'})
},
u'aldryn_segmentation.switchsegmentpluginmodel': {
'Meta': {'object_name': 'SwitchSegmentPluginModel'},
u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}),
'label': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '128', 'blank': 'True'}),
'on_off': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
},
'cms.cmsplugin': {
'Meta': {'object_name': 'CMSPlugin'},
'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}),
'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
},
'cms.placeholder': {
'Meta': {'object_name': 'Placeholder'},
'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'slot': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'})
}
}
complete_apps = ['aldryn_segmentation']
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('cms', '0012_auto_20150607_2207'),
]
operations = [
migrations.CreateModel(
name='Segment',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
],
options={
'managed': False,
},
bases=(models.Model,),
),
migrations.CreateModel(
name='AuthenticatedSegmentPluginModel',
fields=[
('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
('label', models.CharField(default='', max_length=128, verbose_name='label', blank=True)),
],
options={
'abstract': False,
},
bases=('cms.cmsplugin',),
),
migrations.CreateModel(
name='CookieSegmentPluginModel',
fields=[
('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
('label', models.CharField(default='', max_length=128, verbose_name='label', blank=True)),
('cookie_key', models.CharField(default='', help_text='Name of cookie to consider.', max_length=4096, verbose_name='name of cookie')),
('cookie_value', models.CharField(default='', help_text='Value to consider.', max_length=4096, verbose_name='value to compare')),
],
options={
'abstract': False,
},
bases=('cms.cmsplugin',),
),
migrations.CreateModel(
name='FallbackSegmentPluginModel',
fields=[
('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
('label', models.CharField(default='', max_length=128, verbose_name='label', blank=True)),
],
options={
'abstract': False,
},
bases=('cms.cmsplugin',),
),
migrations.CreateModel(
name='SegmentLimitPluginModel',
fields=[
('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
('label', models.CharField(default='', help_text='Optionally set a label for this limit block.', max_length=128, verbose_name='label', blank=True)),
('max_children', models.PositiveIntegerField(default=1, help_text='Display up to how many matching segments?', verbose_name='# of matches to display')),
],
options={
'abstract': False,
},
bases=('cms.cmsplugin',),
),
migrations.CreateModel(
name='SwitchSegmentPluginModel',
fields=[
('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
('label', models.CharField(default='', max_length=128, verbose_name='label', blank=True)),
('on_off', models.BooleanField(default=True, help_text='Uncheck to always hide child plugins.', verbose_name='Always on?')),
],
options={
'abstract': False,
},
bases=('cms.cmsplugin',),
),
]

@ -19,7 +19,7 @@ class Migration(migrations.Migration):
('cms', '0003_auto_20140926_2347'),
('taggit', '__first__'),
('filer', '0001_initial'),
('cmsplugin_filer_image', '0001_initial'),
# ('cmsplugin_filer_image', '0001_initial'),
]
operations = [

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('blog', '0009_auto_20150726_2021'),
]
operations = [
migrations.AlterField(
model_name='post',
name='author',
field=models.ForeignKey(related_name='blog_post_author', verbose_name='Author', blank=True, to='aldryn_people.Person', null=True),
preserve_default=True,
),
]

@ -1,71 +1,44 @@
# -*- coding: utf-8 -*-
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
class Migration(SchemaMigration):
def forwards(self, orm):
# Adding model 'CMSTabsList'
db.create_table('cmsplugin_cmstabslist', (
('cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)),
))
db.send_create_signal('cmsplugin_tabs', ['CMSTabsList'])
# Adding model 'SingleTab'
db.create_table('cmsplugin_tabs_singletab', (
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('plugin', self.gf('django.db.models.fields.related.ForeignKey')(related_name='tabs', to=orm['cmsplugin_tabs.CMSTabsList'])),
('title', self.gf('django.db.models.fields.CharField')(max_length=32)),
('content', self.gf('django.db.models.fields.TextField')()),
('order', self.gf('django.db.models.fields.PositiveIntegerField')(default=1, db_index=True)),
))
db.send_create_signal('cmsplugin_tabs', ['SingleTab'])
def backwards(self, orm):
# Deleting model 'CMSTabsList'
db.delete_table('cmsplugin_cmstabslist')
# Deleting model 'SingleTab'
db.delete_table('cmsplugin_tabs_singletab')
models = {
'cms.cmsplugin': {
'Meta': {'object_name': 'CMSPlugin'},
'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}),
'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
},
'cms.placeholder': {
'Meta': {'object_name': 'Placeholder'},
'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'slot': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'})
},
'cmsplugin_tabs.cmstabslist': {
'Meta': {'object_name': 'CMSTabsList', 'db_table': "'cmsplugin_cmstabslist'", '_ormbases': ['cms.CMSPlugin']},
'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'})
},
'cmsplugin_tabs.singletab': {
'Meta': {'ordering': "['order']", 'object_name': 'SingleTab'},
'content': ('django.db.models.fields.TextField', [], {}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}),
'plugin': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tabs'", 'to': "orm['cmsplugin_tabs.CMSTabsList']"}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '32'})
}
}
complete_apps = ['cmsplugin_tabs']
from __future__ import unicode_literals
from django.db import models, migrations
import tinymce.models
class Migration(migrations.Migration):
dependencies = [
('cms', '0003_auto_20140926_2347'),
]
operations = [
migrations.CreateModel(
name='CMSTabsList',
fields=[
('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
('template', models.CharField(default=b'cmsplugin_tabs/tabs.html', max_length=255, verbose_name='Template', choices=[(b'cmsplugin_tabs/tabs.html', 'Tabs'), (b'cmsplugin_tabs/accordion.html', 'Accordion')])),
],
options={
'abstract': False,
},
bases=('cms.cmsplugin',),
),
migrations.CreateModel(
name='SingleTab',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('title', models.CharField(max_length=255, verbose_name='Title')),
('content', tinymce.models.HTMLField(verbose_name='Content')),
('slug', models.SlugField(default=b'', max_length=32, verbose_name='Slug', blank=True)),
('order', models.PositiveIntegerField(default=1, verbose_name='Order', db_index=True)),
('is_strong', models.BooleanField(default=False, help_text='When True then label of the tab will be bold', verbose_name='Strong')),
('plugin', models.ForeignKey(related_name='tabs', to='cmsplugin_tabs.CMSTabsList')),
],
options={
'ordering': ['order'],
'verbose_name': 'Tab',
'verbose_name_plural': 'Tabs',
},
bases=(models.Model,),
),
]

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -5,7 +5,7 @@ from django.db import models, migrations
import django.db.models.deletion
import parler.models
import djangocms_text_ckeditor.fields
import cms
class Migration(migrations.Migration):
operations = [
@ -43,4 +43,18 @@ class Migration(migrations.Migration):
name='promotranslation',
unique_together=set([('language_code', 'master')]),
),
migrations.AlterModelOptions(
name='promo',
options={'verbose_name': 'promo', 'verbose_name_plural': 'promos'},
),
migrations.RemoveField(
model_name='promotranslation',
name='title',
),
migrations.AlterField(
model_name='promo',
name='page_link',
field=cms.models.fields.PageField(on_delete=models.deletion.SET_NULL, blank=True, to='cms.Page', help_text='A link to a page has priority over a text link.', null=True, verbose_name='page'),
preserve_default=True,
),
]

File diff suppressed because one or more lines are too long

@ -137,4 +137,28 @@ class Migration(migrations.Migration):
field=models.ManyToManyField(to='trademark.Trademark', through='trademark.SearchResult'),
preserve_default=True,
),
migrations.AddField(
model_name='nice',
name='glyph',
field=models.CharField(default='', max_length=255),
preserve_default=False,
),
migrations.AlterField(
model_name='trademark',
name='application_id',
field=models.CharField(max_length=50, null=True),
preserve_default=True,
),
migrations.AlterField(
model_name='trademark',
name='cert_id',
field=models.CharField(max_length=50, null=True),
preserve_default=True,
),
migrations.AlterField(
model_name='trademark',
name='ext_id',
field=models.CharField(unique=True, max_length=50),
preserve_default=True,
),
]

Loading…
Cancel
Save