jbdod/notes-ker-lann
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'consos' into rights

Browse source 
# Conflicts:
#	apps/logs/signals.py
#	note_kfet/settings/base.py
This commit is contained in:
Yohann D'ANELLO 2020-03-17 21:11:14 +01:00
commit 112d4b6c5a
81 changed files with 2850 additions and 818 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/member/admin.py
View file

@ -18,9 +18,9 @@ class ProfileInline(admin.StackedInline):
class CustomUserAdmin(UserAdmin):
inlines = (ProfileInline, )
inlines = (ProfileInline,)
list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff')
list_select_related = ('profile', )
list_select_related = ('profile',)
form = ProfileForm
def get_inline_instances(self, request, obj=None):