update
This commit is contained in:
BIN
rog/.DS_Store
vendored
BIN
rog/.DS_Store
vendored
Binary file not shown.
@ -18,14 +18,14 @@ class ShopRouteAdmin(LeafletAdminListMixin, LeafletGeoAdminMixin, admin.ModelAdm
|
|||||||
list_display=['name',]
|
list_display=['name',]
|
||||||
|
|
||||||
class UserAdminConfig(UserAdmin):
|
class UserAdminConfig(UserAdmin):
|
||||||
search_fields = ('email', 'group',)
|
search_fields = ('email', 'group', 'is_rogaining')
|
||||||
list_filter = ('email', 'group')
|
list_filter = ('email', 'group', 'is_rogaining')
|
||||||
ordering = ('email',)
|
ordering = ('email',)
|
||||||
list_display = ('email', 'group', 'is_active', 'is_staff',)
|
list_display = ('email', 'group', 'is_active', 'is_staff', 'is_rogaining')
|
||||||
|
|
||||||
fieldsets = (
|
fieldsets = (
|
||||||
(None, {'fields':('email', 'group')}),
|
(None, {'fields':('email', 'group')}),
|
||||||
('Permissions', {'fields':('is_staff', 'is_active',)}),
|
('Permissions', {'fields':('is_staff', 'is_active', 'is_rogaining')}),
|
||||||
)
|
)
|
||||||
|
|
||||||
add_fieldsets = (
|
add_fieldsets = (
|
||||||
|
|||||||
18
rog/migrations/0037_customuser_is_rogaining.py
Normal file
18
rog/migrations/0037_customuser_is_rogaining.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 3.2.9 on 2022-10-06 13:42
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('rog', '0036_alter_customuser_email'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='customuser',
|
||||||
|
name='is_rogaining',
|
||||||
|
field=models.BooleanField(default=False),
|
||||||
|
),
|
||||||
|
]
|
||||||
@ -186,6 +186,7 @@ class CustomUser(AbstractBaseUser, PermissionsMixin):
|
|||||||
email = models.CharField(_("Email"), max_length=255, unique=True)
|
email = models.CharField(_("Email"), max_length=255, unique=True)
|
||||||
is_staff = models.BooleanField(default=False)
|
is_staff = models.BooleanField(default=False)
|
||||||
is_active = models.BooleanField(default=True)
|
is_active = models.BooleanField(default=True)
|
||||||
|
is_rogaining = models.BooleanField(default=False)
|
||||||
group = models.CharField(max_length=255,
|
group = models.CharField(max_length=255,
|
||||||
choices=Groups.choices,
|
choices=Groups.choices,
|
||||||
default=Groups.GB1)
|
default=Groups.GB1)
|
||||||
|
|||||||
@ -74,7 +74,7 @@ class CreateUserSerializer(serializers.ModelSerializer):
|
|||||||
class UserSerializer(serializers.ModelSerializer):
|
class UserSerializer(serializers.ModelSerializer):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = CustomUser
|
model = CustomUser
|
||||||
fields = ('id','email', 'group')
|
fields = ('id','email', 'is_rogaining' ,'group')
|
||||||
|
|
||||||
|
|
||||||
class RogUserSerializer(serializers.ModelSerializer):
|
class RogUserSerializer(serializers.ModelSerializer):
|
||||||
|
|||||||
Reference in New Issue
Block a user