diff --git a/rog/.DS_Store b/rog/.DS_Store index 9bf2014..17c323d 100644 Binary files a/rog/.DS_Store and b/rog/.DS_Store differ diff --git a/rog/admin.py b/rog/admin.py index b03a180..04798a2 100644 --- a/rog/admin.py +++ b/rog/admin.py @@ -18,14 +18,14 @@ class ShopRouteAdmin(LeafletAdminListMixin, LeafletGeoAdminMixin, admin.ModelAdm list_display=['name',] class UserAdminConfig(UserAdmin): - search_fields = ('email', 'group',) - list_filter = ('email', 'group') + search_fields = ('email', 'group', 'is_rogaining') + list_filter = ('email', 'group', 'is_rogaining') ordering = ('email',) - list_display = ('email', 'group', 'is_active', 'is_staff',) + list_display = ('email', 'group', 'is_active', 'is_staff', 'is_rogaining') fieldsets = ( (None, {'fields':('email', 'group')}), - ('Permissions', {'fields':('is_staff', 'is_active',)}), + ('Permissions', {'fields':('is_staff', 'is_active', 'is_rogaining')}), ) add_fieldsets = ( diff --git a/rog/migrations/0037_customuser_is_rogaining.py b/rog/migrations/0037_customuser_is_rogaining.py new file mode 100644 index 0000000..d02707f --- /dev/null +++ b/rog/migrations/0037_customuser_is_rogaining.py @@ -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), + ), + ] diff --git a/rog/models.py b/rog/models.py index d9a1296..7e8f645 100644 --- a/rog/models.py +++ b/rog/models.py @@ -186,6 +186,7 @@ class CustomUser(AbstractBaseUser, PermissionsMixin): email = models.CharField(_("Email"), max_length=255, unique=True) is_staff = models.BooleanField(default=False) is_active = models.BooleanField(default=True) + is_rogaining = models.BooleanField(default=False) group = models.CharField(max_length=255, choices=Groups.choices, default=Groups.GB1) diff --git a/rog/serializers.py b/rog/serializers.py index d2186ef..55deadd 100644 --- a/rog/serializers.py +++ b/rog/serializers.py @@ -74,7 +74,7 @@ class CreateUserSerializer(serializers.ModelSerializer): class UserSerializer(serializers.ModelSerializer): class Meta: model = CustomUser - fields = ('id','email', 'group') + fields = ('id','email', 'is_rogaining' ,'group') class RogUserSerializer(serializers.ModelSerializer):