Skip to content

Commit fd8db2d

Browse files
committed
Fixed migrations
1 parent 2386bf9 commit fd8db2d

File tree

5 files changed

+27
-47
lines changed

5 files changed

+27
-47
lines changed

CHANGELOG.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Changelog
55
Unreleased
66
==================
77
* fix: Error when rendering a Draft Snippet plugin on a Published page
8+
* fix: Cleanup unnecessary migration files
9+
* fix: Publish snippets by default as they were already in that state pre-versioning!
810
* feat: djangocms-versioning support added, including model restructure and configuration
911
* feat: django-cms v4.0.x support added
1012

djangocms_snippet/migrations/0010_cms4_grouper_version_data_migration.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,28 @@ def cms4_grouper_version_migration(apps, schema_editor):
2929
snippet_contenttype = ContentType.objects.get(app_label='djangocms_snippet', model='snippet')
3030
snippet_queryset = Snippet.objects.all()
3131

32+
# Get a migration user to create a version.
33+
if djangocms_versioning_config_enabled and djangocms_versioning_installed:
34+
Version = apps.get_model('djangocms_versioning', 'Version')
35+
36+
migration_user = User.objects.get(id=DJANGOCMS_SNIPPET_VERSIONING_MIGRATION_USER_ID)
37+
3238
for snippet in snippet_queryset:
3339
grouper = SnippetGrouper.objects.create()
3440
snippet.snippet_grouper = grouper
3541
snippet.save()
3642

37-
# Get a migration user.
38-
migration_user = User.objects.get(id=DJANGOCMS_SNIPPET_VERSIONING_MIGRATION_USER_ID)
39-
4043
# Create initial Snippet Versions if versioning is enabled and installed.
4144
if djangocms_versioning_config_enabled and djangocms_versioning_installed:
42-
Version = apps.get_model('djangocms_versioning', 'Version')
43-
Version.objects.create(
45+
snippet_version = Version.objects.create(
4446
created_by=migration_user,
4547
state=DRAFT,
4648
number=1,
4749
object_id=snippet.pk,
4850
content_type=snippet_contenttype,
4951
)
52+
# Publish the snippet because all snippets were assumed published before
53+
snippet_version.publish(migration_user)
5054

5155

5256
class Migration(migrations.Migration):

djangocms_snippet/migrations/0012_auto_20210915_0721.py

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,26 @@ class Migration(migrations.Migration):
1717
),
1818
migrations.AlterField(
1919
model_name='snippet',
20-
name='snippet_grouper',
21-
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='djangocms_snippet.SnippetGrouper'),
20+
name='name',
21+
field=models.CharField(max_length=255, verbose_name='Name'),
22+
),
23+
migrations.AlterField(
24+
model_name='snippet',
25+
name='slug',
26+
field=models.SlugField(default='', max_length=255, verbose_name='Slug'),
27+
),
28+
migrations.AlterModelOptions(
29+
name='snippet',
30+
options={'verbose_name': 'Snippet', 'verbose_name_plural': 'Snippets'},
2231
),
2332
migrations.AlterField(
2433
model_name='snippetptr',
2534
name='snippet_grouper',
2635
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='djangocms_snippet.SnippetGrouper'),
2736
),
37+
migrations.AlterField(
38+
model_name='snippet',
39+
name='snippet_grouper',
40+
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='djangocms_snippet.SnippetGrouper'),
41+
),
2842
]

djangocms_snippet/migrations/0013_auto_20210915_0751.py

Lines changed: 0 additions & 23 deletions
This file was deleted.

djangocms_snippet/migrations/0014_auto_20211019_0522.py

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)