From ed6d2a764fcc76a0feba1c586acb9afddbecd16b Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 12 Nov 2024 17:27:25 +0100 Subject: ♻️ clean all "add_own" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ishtar_common/migrations/0201_squashed.py | 8 +++--- .../migrations/0217_auto_20220328_1222.py | 2 +- .../migrations/0220_auto_20220707_1633.py | 2 +- .../migrations/0232_auto_20231115_1616.py | 4 +-- .../0243_default_biographicalnote_permissions.json | 24 ----------------- .../migrations/0244_imports_media_link.py | 2 +- .../migrations/0256_clean_add_own_permissions.py | 31 ++++++++++++++++++++++ 7 files changed, 40 insertions(+), 33 deletions(-) create mode 100644 ishtar_common/migrations/0256_clean_add_own_permissions.py (limited to 'ishtar_common/migrations') diff --git a/ishtar_common/migrations/0201_squashed.py b/ishtar_common/migrations/0201_squashed.py index aa5582f9a..6a21afd2f 100644 --- a/ishtar_common/migrations/0201_squashed.py +++ b/ishtar_common/migrations/0201_squashed.py @@ -91,7 +91,7 @@ class Migration(migrations.Migration): 'verbose_name': 'Author', 'verbose_name_plural': 'Authors', 'ordering': ('author_type__order', 'person__name'), - 'permissions': (('view_own_author', 'Can view own Author'), ('add_own_author', 'Can add own Author'), ('change_own_author', 'Can change own Author'), ('delete_own_author', 'Can delete own Author')), + 'permissions': (('view_own_author', 'Can view own Author'), ('change_own_author', 'Can change own Author'), ('delete_own_author', 'Can delete own Author')), }, ), migrations.CreateModel( @@ -200,7 +200,7 @@ class Migration(migrations.Migration): 'verbose_name': 'Document', 'verbose_name_plural': 'Documents', 'ordering': ('title',), - 'permissions': (('view_own_document', 'Peut voir ses propres Documents'), ('add_own_document', 'Peut ajouter son propre Document'), ('change_own_document', 'Peut modifier ses propres Documents'), ('delete_own_document', 'Peut supprimer ses propres Documents')), + 'permissions': (('view_own_document', 'Peut voir ses propres Documents'), ('change_own_document', 'Peut modifier ses propres Documents'), ('delete_own_document', 'Peut supprimer ses propres Documents')), }, bases=(ishtar_common.models.StatisticItem, ishtar_common.models.TemplateItem, @@ -749,7 +749,7 @@ class Migration(migrations.Migration): options={ 'verbose_name': 'Organization', 'verbose_name_plural': 'Organizations', - 'permissions': (('view_own_organization', 'Can view own Organization'), ('add_own_organization', 'Can add own Organization'), ('change_own_organization', 'Can change own Organization'), ('delete_own_organization', 'Can delete own Organization')), + 'permissions': (('view_own_organization', 'Can view own Organization'), ('change_own_organization', 'Can change own Organization'), ('delete_own_organization', 'Can delete own Organization')), }, bases=(ishtar_common.models.StatisticItem, ishtar_common.models.TemplateItem, models.Model, @@ -825,7 +825,7 @@ class Migration(migrations.Migration): options={ 'verbose_name': 'Person', 'verbose_name_plural': 'Persons', - 'permissions': (('view_own_person', 'Can view own Person'), ('add_own_person', 'Can add own Person'), ('change_own_person', 'Can change own Person'), ('delete_own_person', 'Can delete own Person')), + 'permissions': (('view_own_person', 'Can view own Person'), ('change_own_person', 'Can change own Person'), ('delete_own_person', 'Can delete own Person')), }, bases=(ishtar_common.models.StatisticItem, ishtar_common.models.TemplateItem, models.Model, diff --git a/ishtar_common/migrations/0217_auto_20220328_1222.py b/ishtar_common/migrations/0217_auto_20220328_1222.py index 68135361d..7aba9fe95 100644 --- a/ishtar_common/migrations/0217_auto_20220328_1222.py +++ b/ishtar_common/migrations/0217_auto_20220328_1222.py @@ -119,7 +119,7 @@ class Migration(migrations.Migration): ), migrations.AlterModelOptions( name='person', - options={'ordering': ['name', 'surname'], 'permissions': (('view_own_person', 'Can view own Person'), ('add_own_person', 'Can add own Person'), ('change_own_person', 'Can change own Person'), ('delete_own_person', 'Can delete own Person')), 'verbose_name': 'Person', 'verbose_name_plural': 'Persons'}, + options={'ordering': ['name', 'surname'], 'permissions': (('view_own_person', 'Can view own Person'), ('change_own_person', 'Can change own Person'), ('delete_own_person', 'Can delete own Person')), 'verbose_name': 'Person', 'verbose_name_plural': 'Persons'}, ), migrations.AlterModelOptions( name='spatialreferencesystem', diff --git a/ishtar_common/migrations/0220_auto_20220707_1633.py b/ishtar_common/migrations/0220_auto_20220707_1633.py index 600adc6a1..48fca1a68 100644 --- a/ishtar_common/migrations/0220_auto_20220707_1633.py +++ b/ishtar_common/migrations/0220_auto_20220707_1633.py @@ -14,7 +14,7 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( name='geovectordata', - options={'permissions': (('view_own_geovectordata', 'Can view own Geographic - Vector data'), ('add_own_geovectordata', 'Can add own Geographic - Vector data'), ('change_own_geovectordata', 'Can change own Geographic - Vector data'), ('delete_own_geovectordata', 'Can delete own Geographic - Vector data')), 'verbose_name': 'Geographic - Vector data', 'verbose_name_plural': 'Geographic - Vector data'}, + options={'permissions': (('view_own_geovectordata', 'Can view own Geographic - Vector data'), ('change_own_geovectordata', 'Can change own Geographic - Vector data'), ('delete_own_geovectordata', 'Can delete own Geographic - Vector data')), 'verbose_name': 'Geographic - Vector data', 'verbose_name_plural': 'Geographic - Vector data'}, ), migrations.AlterField( model_name='document', diff --git a/ishtar_common/migrations/0232_auto_20231115_1616.py b/ishtar_common/migrations/0232_auto_20231115_1616.py index 0ddcf1b9b..e0cf37411 100644 --- a/ishtar_common/migrations/0232_auto_20231115_1616.py +++ b/ishtar_common/migrations/0232_auto_20231115_1616.py @@ -31,7 +31,7 @@ class Migration(migrations.Migration): ), migrations.AlterModelOptions( name='import', - options={'permissions': (('view_own_import', 'Can view own Import'), ('add_own_import', 'Can add own Import'), ('change_own_import', 'Can change own Import'), ('delete_own_import', 'Can delete own Import')), 'verbose_name': 'Import - Import', 'verbose_name_plural': 'Import - Imports'}, + options={'permissions': (('view_own_import', 'Can view own Import'), ('change_own_import', 'Can change own Import'), ('delete_own_import', 'Can delete own Import')), 'verbose_name': 'Import - Import', 'verbose_name_plural': 'Import - Imports'}, ), migrations.AlterModelOptions( name='itemkey', @@ -138,7 +138,7 @@ class Migration(migrations.Migration): options={ 'verbose_name': 'Import - Group', 'verbose_name_plural': 'Import - Groups', - 'permissions': (('view_own_importgroup', 'Can view own Import Group'), ('add_own_importgroup', 'Can add own Import Group'), ('change_own_importgroup', 'Can change own Import Group'), ('delete_own_importgroup', 'Can delete own Import Group')), + 'permissions': (('view_own_importgroup', 'Can view own Import Group'), ('change_own_importgroup', 'Can change own Import Group'), ('delete_own_importgroup', 'Can delete own Import Group')), }, bases=(models.Model, ishtar_common.utils.OwnPerms, ishtar_common.utils.SheetItem), ), diff --git a/ishtar_common/migrations/0243_default_biographicalnote_permissions.json b/ishtar_common/migrations/0243_default_biographicalnote_permissions.json index c2144a855..09238d92a 100644 --- a/ishtar_common/migrations/0243_default_biographicalnote_permissions.json +++ b/ishtar_common/migrations/0243_default_biographicalnote_permissions.json @@ -61,17 +61,6 @@ "codename": "view_own_biographicalnote" } }, - { - "model": "auth.permission", - "fields": { - "name": "Can add own Biographical note", - "content_type": [ - "ishtar_common", - "biographicalnote" - ], - "codename": "add_own_biographicalnote" - } - }, { "model": "auth.permission", "fields": { @@ -146,19 +135,6 @@ ] } }, - { - "model": "auth.group", - "fields": { - "name": "Notices biographiques rattach\u00e9es : ajout", - "permissions": [ - [ - "add_own_biographicalnote", - "ishtar_common", - "biographicalnote" - ] - ] - } - }, { "model": "auth.group", "fields": { diff --git a/ishtar_common/migrations/0244_imports_media_link.py b/ishtar_common/migrations/0244_imports_media_link.py index 88a36049f..f2437ceda 100644 --- a/ishtar_common/migrations/0244_imports_media_link.py +++ b/ishtar_common/migrations/0244_imports_media_link.py @@ -12,7 +12,7 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( name='biographicalnote', - options={'permissions': (('view_own_biographicalnote', 'Can view own Biographical note'), ('add_own_biographicalnote', 'Can add own Biographical note'), ('change_own_biographicalnote', 'Can change own Biographical note'), ('delete_own_biographicalnote', 'Can delete own Biographical note')), 'verbose_name': 'Biographical note', 'verbose_name_plural': 'Biographical notes'}, + options={'permissions': (('view_own_biographicalnote', 'Can view own Biographical note'), ('change_own_biographicalnote', 'Can change own Biographical note'), ('delete_own_biographicalnote', 'Can delete own Biographical note')), 'verbose_name': 'Biographical note', 'verbose_name_plural': 'Biographical notes'}, ), migrations.AddField( model_name='import', diff --git a/ishtar_common/migrations/0256_clean_add_own_permissions.py b/ishtar_common/migrations/0256_clean_add_own_permissions.py new file mode 100644 index 000000000..6ad695dca --- /dev/null +++ b/ishtar_common/migrations/0256_clean_add_own_permissions.py @@ -0,0 +1,31 @@ +# Generated by Django 2.2.28 on 2024-11-12 17:12 + +from django.db import migrations + + +def clean_permissions(app, __): + Group = app.get_model("auth", "group") + for group in Group.objects.filter(permissions__codename__startswith="add_own_").all(): + if group.permissions.exclude( + codename__startswith="add_own_").count(): + # other groups, only remove "own" + for own_grp in group.permissions.filter( + codename__startswith="add_own_").all(): + group.permissions.remove(own_grp) + continue + for user in group.user_set.all(): + user.groups.remove(group) + for pt in group.profile_types.all(): + pt.groups.remove(group) + group.delete() + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0255_migrate_delete_perm_clean_groups'), + ] + + operations = [ + migrations.RunPython(clean_permissions) + ] -- cgit v1.2.3