From cdf6a513b86a8b0d4d9beae5d133f9bbd3a4962b Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Sat, 8 Jan 2022 21:32:58 +0100
Subject: [PATCH] Merge avatar migrations
---
.../0030_person_avatar_permission.py | 21 -------------------
.../migrations/0033_update_photo_avatar.py | 8 +++++++
2 files changed, 8 insertions(+), 21 deletions(-)
delete mode 100644 aleksis/core/migrations/0030_person_avatar_permission.py
diff --git a/aleksis/core/migrations/0030_person_avatar_permission.py b/aleksis/core/migrations/0030_person_avatar_permission.py
deleted file mode 100644
index fb31b249b..000000000
--- a/aleksis/core/migrations/0030_person_avatar_permission.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Generated by Django 3.2.9 on 2021-12-20 15:40
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('core', '0029_photo_avatar_croppable'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='globalpermissions',
- options={'default_permissions': (), 'managed': False, 'permissions': (('view_system_status', 'Can view system status'), ('manage_data', 'Can manage data'), ('impersonate', 'Can impersonate'), ('search', 'Can use search'), ('change_site_preferences', 'Can change site preferences'), ('change_person_preferences', 'Can change person preferences'), ('change_group_preferences', 'Can change group preferences'), ('test_pdf', 'Can test PDF generation'))},
- ),
- migrations.AlterModelOptions(
- name='person',
- options={'ordering': ['last_name', 'first_name'], 'permissions': (('view_address', 'Can view address'), ('view_contact_details', 'Can view contact details'), ('view_photo', 'Can view photo'), ('view_avatar', 'Can view avatar image'), ('view_person_groups', 'Can view persons groups'), ('view_personal_details', 'Can view personal details')), 'verbose_name': 'Person', 'verbose_name_plural': 'Persons'},
- ),
- ]
diff --git a/aleksis/core/migrations/0033_update_photo_avatar.py b/aleksis/core/migrations/0033_update_photo_avatar.py
index 12dfa4fbc..e20c6ee6b 100644
--- a/aleksis/core/migrations/0033_update_photo_avatar.py
+++ b/aleksis/core/migrations/0033_update_photo_avatar.py
@@ -30,4 +30,12 @@ class Migration(migrations.Migration):
name='photo',
field=models.ImageField(blank=True, help_text='This is an official photo, used for official documents and for internal use cases.', null=True, upload_to='', verbose_name='Photo'),
),
+ migrations.AlterModelOptions(
+ name='globalpermissions',
+ options={'default_permissions': (), 'managed': False, 'permissions': (('view_system_status', 'Can view system status'), ('manage_data', 'Can manage data'), ('impersonate', 'Can impersonate'), ('search', 'Can use search'), ('change_site_preferences', 'Can change site preferences'), ('change_person_preferences', 'Can change person preferences'), ('change_group_preferences', 'Can change group preferences'), ('test_pdf', 'Can test PDF generation'))},
+ ),
+ migrations.AlterModelOptions(
+ name='person',
+ options={'ordering': ['last_name', 'first_name'], 'permissions': (('view_address', 'Can view address'), ('view_contact_details', 'Can view contact details'), ('view_photo', 'Can view photo'), ('view_avatar', 'Can view avatar image'), ('view_person_groups', 'Can view persons groups'), ('view_personal_details', 'Can view personal details')), 'verbose_name': 'Person', 'verbose_name_plural': 'Persons'},
+ ),
]
--
GitLab