klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-22 14:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge

Browse Source
This commit is contained in:
gnikwo 2017-10-22 19:12:28 +02:00
parent 8d1c648032
commit 17d3860ec5
No known key found for this signature in database
GPG Key ID: 7498D7DF2F867695
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/admin.py
View File

@ -2,7 +2,6 @@
# #
# Copyright 2016,2017 # Copyright 2016,2017
# - Skia <skia@libskia.so> # - Skia <skia@libskia.so>
# - Nabos <gnikwo@hotmail.com>
# #
# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM, # Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
# http://ae.utbm.fr. # http://ae.utbm.fr.
@ -29,12 +28,9 @@ from core.models import User, Page, RealGroup, SithFile
from django.contrib.auth.models import Group as AuthGroup from django.contrib.auth.models import Group as AuthGroup
from haystack.admin import SearchModelAdmin from haystack.admin import SearchModelAdmin
@admin.register(SithFile)
class SithFileAdmin(admin.ModelAdmin):
form = make_ajax_form(SithFile, {
'parent': 'files', # ManyToManyField
})
admin.site.unregister(AuthGroup)
admin.site.register(RealGroup)
class UserAdmin(SearchModelAdmin): class UserAdmin(SearchModelAdmin):
list_display = ["first_name", "last_name", "username", "email", "nick_name"] list_display = ["first_name", "last_name", "username", "email", "nick_name"]
@ -49,11 +45,6 @@ class UserAdmin(SearchModelAdmin):
admin.site.register(User, UserAdmin) admin.site.register(User, UserAdmin)
search_fields = ['username', 'first_name', 'last_name']
list_display = ('username', 'first_name', 'last_name')
list_filter = ['department', 'promo', 'groups']
list_per_page = 20
@admin.register(Page) @admin.register(Page)
class PageAdmin(admin.ModelAdmin): class PageAdmin(admin.ModelAdmin):
form = make_ajax_form(Page, { form = make_ajax_form(Page, {
@ -63,6 +54,8 @@ class PageAdmin(admin.ModelAdmin):
'view_groups': 'groups', 'view_groups': 'groups',
}) })
admin.site.register(User, UserAdmin) @admin.register(SithFile)
admin.site.unregister(AuthGroup) class SithFileAdmin(admin.ModelAdmin):
admin.site.register(RealGroup) form = make_ajax_form(SithFile, {
'parent': 'files', # ManyToManyField
})