mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix reverse migration errors in images and documents (#6908) 

* Fix reverse migration errors in images and documents

* iterate on choose_permission migration

Co-authored-by: Michael Brown <michael.brown3@oig.hhs.gov>
pull/6972/head
Mike Brown 2021-04-06 04:25:41 -04:00 zatwierdzone przez GitHub
rodzic e973c3d544
commit f0e2371c85
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 10 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
wagtail/documents/migrations/0011_add_choose_permissions.py
Wyświetl plik

@ -54,7 +54,7 @@ def get_choose_permission(apps):
return Permission.objects.filter(
content_type=document_content_type,
codename__in=['choose_document']
)
).first()
def copy_choose_permission_to_collections(apps, _schema_editor):
@ -64,7 +64,8 @@ def copy_choose_permission_to_collections(apps, _schema_editor):
root_collection = Collection.objects.get(depth=1)
for permission in get_choose_permission(apps):
permission = get_choose_permission(apps)
if permission:
for group in Group.objects.filter(permissions=permission):
GroupCollectionPermission.objects.create(
group=group,
@ -76,8 +77,8 @@ def copy_choose_permission_to_collections(apps, _schema_editor):
def remove_choose_permission_from_collections(apps, _schema_editor):
GroupCollectionPermission = apps.get_model('wagtailcore.GroupCollectionPermission')
choose_permission = get_choose_permission(apps)
GroupCollectionPermission.objects.filter(permission=choose_permission).delete()
if choose_permission:
GroupCollectionPermission.objects.filter(permission=choose_permission).delete()
class Migration(migrations.Migration):

9
wagtail/images/migrations/0023_add_choose_permissions.py
Wyświetl plik

@ -54,7 +54,7 @@ def get_choose_permission(apps):
return Permission.objects.filter(
content_type=image_content_type,
codename__in=['choose_image']
)
).first()
def copy_choose_permission_to_collections(apps, _schema_editor):
@ -64,7 +64,8 @@ def copy_choose_permission_to_collections(apps, _schema_editor):
root_collection = Collection.objects.get(depth=1)
for permission in get_choose_permission(apps):
permission = get_choose_permission(apps)
if permission:
for group in Group.objects.filter(permissions=permission):
GroupCollectionPermission.objects.create(
group=group,
@ -76,8 +77,8 @@ def copy_choose_permission_to_collections(apps, _schema_editor):
def remove_choose_permission_from_collections(apps, _schema_editor):
GroupCollectionPermission = apps.get_model('wagtailcore.GroupCollectionPermission')
choose_permission = get_choose_permission(apps)
GroupCollectionPermission.objects.filter(permission=choose_permission).delete()
if choose_permission:
GroupCollectionPermission.objects.filter(permission=choose_permission).delete()
class Migration(migrations.Migration):