From cc8a3c8bc8c4917e4110543c422daef87c4a1944 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 5 May 2020 13:19:00 +0200 Subject: [PATCH 02/10] custom_user: remove permission view_user (#42504) This permission was never used and it is now used by Django 2.1. --- .../custom_user/migrations/0003_auto_20150504_1410.py | 2 +- .../custom_user/migrations/0009_auto_20150810_1953.py | 2 +- .../custom_user/migrations/0015_auto_20170707_1653.py | 2 +- src/authentic2/custom_user/models.py | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git src/authentic2/custom_user/migrations/0003_auto_20150504_1410.py src/authentic2/custom_user/migrations/0003_auto_20150504_1410.py index 70e48d1b..209a4cf8 100644 --- src/authentic2/custom_user/migrations/0003_auto_20150504_1410.py +++ src/authentic2/custom_user/migrations/0003_auto_20150504_1410.py @@ -13,6 +13,6 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( name='user', - options={'verbose_name': 'user', 'verbose_name_plural': 'users', 'permissions': (('view_user', 'can see available users'),)}, + options={'verbose_name': 'user', 'verbose_name_plural': 'users',}, ), ] diff --git src/authentic2/custom_user/migrations/0009_auto_20150810_1953.py src/authentic2/custom_user/migrations/0009_auto_20150810_1953.py index 84c393cf..a7eab7bc 100644 --- src/authentic2/custom_user/migrations/0009_auto_20150810_1953.py +++ src/authentic2/custom_user/migrations/0009_auto_20150810_1953.py @@ -13,6 +13,6 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( name='user', - options={'ordering': ('first_name', 'last_name', 'email', 'username'), 'verbose_name': 'user', 'verbose_name_plural': 'users', 'permissions': (('view_user', 'can see available users'),)}, + options={'ordering': ('first_name', 'last_name', 'email', 'username'), 'verbose_name': 'user', 'verbose_name_plural': 'users',}, ), ] diff --git src/authentic2/custom_user/migrations/0015_auto_20170707_1653.py src/authentic2/custom_user/migrations/0015_auto_20170707_1653.py index 9e577411..197e44c6 100644 --- src/authentic2/custom_user/migrations/0015_auto_20170707_1653.py +++ src/authentic2/custom_user/migrations/0015_auto_20170707_1653.py @@ -13,6 +13,6 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( name='user', - options={'ordering': ('last_name', 'first_name', 'email', 'username'), 'verbose_name': 'user', 'verbose_name_plural': 'users', 'permissions': (('view_user', 'can see available users'),)}, + options={'ordering': ('last_name', 'first_name', 'email', 'username'), 'verbose_name': 'user', 'verbose_name_plural': 'users',}, ), ] diff --git src/authentic2/custom_user/models.py src/authentic2/custom_user/models.py index eade0b0f..4800c1c3 100644 --- src/authentic2/custom_user/models.py +++ src/authentic2/custom_user/models.py @@ -186,9 +186,6 @@ class User(AbstractBaseUser, PermissionMixin): class Meta: verbose_name = _('user') verbose_name_plural = _('users') - permissions = ( - ('view_user', 'can see available users'), - ) ordering = ('last_name', 'first_name', 'email', 'username') def get_full_name(self): -- 2.26.0