1
0
mirror of https://gitlab.crans.org/mediatek/med.git synced 2025-07-05 14:03:54 +02:00

Rename pseudo to username

This commit is contained in:
Alexandre Iooss
2019-08-02 21:35:30 +02:00
parent afdb08b926
commit e82053d16f
11 changed files with 91 additions and 63 deletions

View File

@ -11,17 +11,6 @@ from .forms import UserChangeForm, UserCreationForm
from .models import User, Right, Adhesion, ListRight, Clef, Request
class UserAdmin(admin.ModelAdmin):
list_display = (
'name',
'surname',
'pseudo',
'email',
'is_active'
)
search_fields = ('name', 'surname', 'pseudo')
class RequestAdmin(admin.ModelAdmin):
list_display = ('user', 'type', 'created_at', 'expires_at')
@ -50,10 +39,10 @@ class UserAdmin(VersionAdmin, BaseUserAdmin):
# The fields to be used in displaying the User model.
# These override the definitions on the base UserAdmin
# that reference specific fields on auth.User.
list_display = ('pseudo', 'name', 'surname', 'email', 'is_admin')
list_display = ('username', 'name', 'surname', 'email', 'is_admin')
list_filter = ()
fieldsets = (
(None, {'fields': ('pseudo', 'password')}),
(None, {'fields': ('username', 'password')}),
('Personal info', {'fields': ('name', 'surname', 'email')}),
('Permissions', {'fields': ('is_admin',)}),
)
@ -62,11 +51,11 @@ class UserAdmin(VersionAdmin, BaseUserAdmin):
add_fieldsets = (
(None, {
'classes': ('wide',),
'fields': ('pseudo', 'name', 'surname', 'email', 'is_admin', 'password1', 'password2')}
'fields': ('username', 'name', 'surname', 'email', 'is_admin', 'password1', 'password2')}
),
)
search_fields = ('pseudo',)
ordering = ('pseudo',)
search_fields = ('username',)
ordering = ('username',)
filter_horizontal = ()