mitri4
/
zuykov
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
remotes/origin/upgrade-requirements
Alexander Kondratyev 9 years ago
parent 765721e2e0
commit c0c6f39f19
10 changed files with 255 additions and 251 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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

45
packages/aldryn_people/migrations/0004_auto_20150622_1606.py
Unescape View File

@ -2,12 +2,13 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import models, migrations from django.db import models, migrations
import filer
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('aldryn_people', '0003_auto_20150425_2103'), ('aldryn_people', '0003_auto_20150425_2103'),
('filer', '0002_auto_20150606_2003'),
] ]
operations = [ operations = [
@ -31,4 +32,46 @@ class Migration(migrations.Migration):
field=models.CharField(max_length=15, verbose_name='Language', db_index=True), field=models.CharField(max_length=15, verbose_name='Language', db_index=True),
preserve_default=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,
)
] ]

206
packages/aldryn_segmentation/migrations/0001_initial.py
Unescape View File

@ -1,125 +1,83 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime from __future__ import unicode_literals
from south.db import db
from south.v2 import SchemaMigration from django.db import models, migrations
from django.db import models
class Migration(migrations.Migration):
class Migration(SchemaMigration):
dependencies = [
def forwards(self, orm): ('cms', '0012_auto_20150607_2207'),
# 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)), operations = [
('label', self.gf('django.db.models.fields.CharField')(default=u'', max_length=128, blank=True)), migrations.CreateModel(
('max_children', self.gf('django.db.models.fields.PositiveIntegerField')(default=1)), name='Segment',
)) fields=[
db.send_create_signal(u'aldryn_segmentation', ['SegmentLimitPluginModel']) ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
],
# Adding model 'FallbackSegmentPluginModel' options={
db.create_table(u'aldryn_segmentation_fallbacksegmentpluginmodel', ( 'managed': False,
(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)), bases=(models.Model,),
)) ),
db.send_create_signal(u'aldryn_segmentation', ['FallbackSegmentPluginModel']) migrations.CreateModel(
name='AuthenticatedSegmentPluginModel',
# Adding model 'SwitchSegmentPluginModel' fields=[
db.create_table(u'aldryn_segmentation_switchsegmentpluginmodel', ( ('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
(u'cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)), ('label', models.CharField(default='', max_length=128, verbose_name='label', blank=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)), options={
)) 'abstract': False,
db.send_create_signal(u'aldryn_segmentation', ['SwitchSegmentPluginModel']) },
bases=('cms.cmsplugin',),
# Adding model 'CookieSegmentPluginModel' ),
db.create_table(u'aldryn_segmentation_cookiesegmentpluginmodel', ( migrations.CreateModel(
(u'cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)), name='CookieSegmentPluginModel',
('label', self.gf('django.db.models.fields.CharField')(default=u'', max_length=128, blank=True)), fields=[
('cookie_key', self.gf('django.db.models.fields.CharField')(default=u'', max_length=4096)), ('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
('cookie_value', self.gf('django.db.models.fields.CharField')(default=u'', max_length=4096)), ('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')),
db.send_create_signal(u'aldryn_segmentation', ['CookieSegmentPluginModel']) ('cookie_value', models.CharField(default='', help_text='Value to consider.', max_length=4096, verbose_name='value to compare')),
],
# Adding model 'AuthenticatedSegmentPluginModel' options={
db.create_table(u'aldryn_segmentation_authenticatedsegmentpluginmodel', ( 'abstract': False,
(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)), bases=('cms.cmsplugin',),
)) ),
db.send_create_signal(u'aldryn_segmentation', ['AuthenticatedSegmentPluginModel']) migrations.CreateModel(
name='FallbackSegmentPluginModel',
fields=[
def backwards(self, orm): ('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
# Deleting model 'SegmentLimitPluginModel' ('label', models.CharField(default='', max_length=128, verbose_name='label', blank=True)),
db.delete_table(u'aldryn_segmentation_segmentlimitpluginmodel') ],
options={
# Deleting model 'FallbackSegmentPluginModel' 'abstract': False,
db.delete_table(u'aldryn_segmentation_fallbacksegmentpluginmodel') },
bases=('cms.cmsplugin',),
# Deleting model 'SwitchSegmentPluginModel' ),
db.delete_table(u'aldryn_segmentation_switchsegmentpluginmodel') migrations.CreateModel(
name='SegmentLimitPluginModel',
# Deleting model 'CookieSegmentPluginModel' fields=[
db.delete_table(u'aldryn_segmentation_cookiesegmentpluginmodel') ('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)),
# Deleting model 'AuthenticatedSegmentPluginModel' ('max_children', models.PositiveIntegerField(default=1, help_text='Display up to how many matching segments?', verbose_name='# of matches to display')),
db.delete_table(u'aldryn_segmentation_authenticatedsegmentpluginmodel') ],
options={
'abstract': False,
models = { },
u'aldryn_segmentation.authenticatedsegmentpluginmodel': { bases=('cms.cmsplugin',),
'Meta': {'object_name': 'AuthenticatedSegmentPluginModel'}, ),
u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}), migrations.CreateModel(
'label': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '128', 'blank': 'True'}) name='SwitchSegmentPluginModel',
}, fields=[
u'aldryn_segmentation.cookiesegmentpluginmodel': { ('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
'Meta': {'object_name': 'CookieSegmentPluginModel'}, ('label', models.CharField(default='', max_length=128, verbose_name='label', blank=True)),
u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}), ('on_off', models.BooleanField(default=True, help_text='Uncheck to always hide child plugins.', verbose_name='Always on?')),
'cookie_key': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '4096'}), ],
'cookie_value': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '4096'}), options={
'label': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '128', 'blank': 'True'}) 'abstract': False,
}, },
u'aldryn_segmentation.fallbacksegmentpluginmodel': { bases=('cms.cmsplugin',),
'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']

2
packages/blog/migrations/0001_initial.py
Unescape View File

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

20
packages/blog/migrations/0010_auto_20170401_1032.py
Unescape View File

@ -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,
),
]

113
packages/cmsplugin_tabs/migrations/0001_initial.py
Unescape View File

@ -1,71 +1,44 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import datetime from __future__ import unicode_literals
from south.db import db
from south.v2 import SchemaMigration from django.db import models, migrations
from django.db import models import tinymce.models
class Migration(SchemaMigration): class Migration(migrations.Migration):
def forwards(self, orm): dependencies = [
# Adding model 'CMSTabsList' ('cms', '0003_auto_20140926_2347'),
db.create_table('cmsplugin_cmstabslist', ( ]
('cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)),
)) operations = [
db.send_create_signal('cmsplugin_tabs', ['CMSTabsList']) migrations.CreateModel(
name='CMSTabsList',
# Adding model 'SingleTab' fields=[
db.create_table('cmsplugin_tabs_singletab', ( ('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('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')])),
('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)), options={
('content', self.gf('django.db.models.fields.TextField')()), 'abstract': False,
('order', self.gf('django.db.models.fields.PositiveIntegerField')(default=1, db_index=True)), },
)) bases=('cms.cmsplugin',),
db.send_create_signal('cmsplugin_tabs', ['SingleTab']) ),
migrations.CreateModel(
name='SingleTab',
def backwards(self, orm): fields=[
# Deleting model 'CMSTabsList' ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
db.delete_table('cmsplugin_cmstabslist') ('title', models.CharField(max_length=255, verbose_name='Title')),
('content', tinymce.models.HTMLField(verbose_name='Content')),
# Deleting model 'SingleTab' ('slug', models.SlugField(default=b'', max_length=32, verbose_name='Slug', blank=True)),
db.delete_table('cmsplugin_tabs_singletab') ('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')),
models = { ],
'cms.cmsplugin': { options={
'Meta': {'object_name': 'CMSPlugin'}, 'ordering': ['order'],
'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'verbose_name': 'Tab',
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'verbose_name_plural': 'Tabs',
'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), },
'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), bases=(models.Model,),
'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']

78
packages/country_segment/migrations/0001_initial.py
View File

File diff suppressed because one or more lines are too long

1
promo/fixtures/data.json
View File

File diff suppressed because one or more lines are too long

16
promo/migrations/0001_initial.py
Unescape View File

@ -5,7 +5,7 @@ from django.db import models, migrations
import django.db.models.deletion import django.db.models.deletion
import parler.models import parler.models
import djangocms_text_ckeditor.fields import djangocms_text_ckeditor.fields
import cms
class Migration(migrations.Migration): class Migration(migrations.Migration):
operations = [ operations = [
@ -43,4 +43,18 @@ class Migration(migrations.Migration):
name='promotranslation', name='promotranslation',
unique_together=set([('language_code', 'master')]), 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,
),
] ]

1
trademark/fixtures/nice.json
View File

File diff suppressed because one or more lines are too long

24
trademark/migrations/0001_initial.py
Unescape View File

@ -137,4 +137,28 @@ class Migration(migrations.Migration):
field=models.ManyToManyField(to='trademark.Trademark', through='trademark.SearchResult'), field=models.ManyToManyField(to='trademark.Trademark', through='trademark.SearchResult'),
preserve_default=True, 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,
),
] ]

Write Preview
Loading…
Cancel
Save