Skip to content

Commit 14c74dd

Browse files
committed
Removed hardcoded user model references.
1 parent 0ff51c0 commit 14c74dd

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

src/emailuser/admin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
from django.contrib.auth import get_user_model
12
from django.contrib import admin
23
from django.contrib.auth.admin import UserAdmin
34

45
from .forms import EmailUserCreationForm, EmailUserChangeForm
5-
from .models import EmailUser
66

77

88
class EmailUserAdmin(UserAdmin):
@@ -31,4 +31,4 @@ class EmailUserAdmin(UserAdmin):
3131
ordering = ('name',)
3232

3333

34-
admin.site.register(EmailUser, EmailUserAdmin)
34+
admin.site.register(get_user_model(), EmailUserAdmin)

src/emailuser/models.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ class Meta:
3030

3131

3232
class EmailUser(AbstractEmailUser):
33-
pass
33+
class Meta(AbstractEmailUser.Meta):
34+
swappable = 'AUTH_USER_MODEL'

src/emailuser/serializers.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1+
from django.contrib.auth import get_user_model
12
from rest_framework import serializers
23

3-
from .models import EmailUser
4-
54

65
class EmailUserSerializer(serializers.ModelSerializer):
76
password = serializers.CharField(
@@ -11,12 +10,12 @@ class EmailUserSerializer(serializers.ModelSerializer):
1110
)
1211

1312
class Meta:
14-
model = EmailUser
13+
model = get_user_model()
1514
fields = ['id', 'email', 'name', 'password']
1615
read_only_fields = ['id',]
1716

1817
def create(self, validated_data):
19-
return EmailUser.objects.create_user(**validated_data)
18+
return get_user_model().objects.create_user(**validated_data)
2019

2120
def update(self, instance, validated_data):
2221
password = validated_data.pop('password', None)

src/emailuser/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
from django.contrib.auth import get_user_model
12
from rest_framework.permissions import AllowAny, IsAuthenticatedOrReadOnly
23
from rest_framework import generics
34
from . import serializers
4-
from .models import EmailUser
55
from .permissions import IsSelfOrReadOnly
66

77

@@ -13,4 +13,4 @@ class RegistrationView(generics.CreateAPIView):
1313
class RetrieveUpdateUserView(generics.RetrieveUpdateAPIView):
1414
permission_classes = [IsAuthenticatedOrReadOnly, IsSelfOrReadOnly]
1515
serializer_class = serializers.EmailUserSerializer
16-
queryset = EmailUser.objects.all()
16+
queryset = get_user_model().objects.all()

0 commit comments

Comments
 (0)