Fixed conflict utils file and folder 3
This commit is contained in:
10
rog/admin.py
10
rog/admin.py
@ -894,11 +894,11 @@ class NewCategoryAdmin(admin.ModelAdmin):
|
|||||||
list_filter = ['family', 'female']
|
list_filter = ['family', 'female']
|
||||||
search_fields = ['category_name']
|
search_fields = ['category_name']
|
||||||
|
|
||||||
@admin.register(Entry)
|
#@admin.register(Entry)
|
||||||
class EntryAdmin(admin.ModelAdmin):
|
#class EntryAdmin(admin.ModelAdmin):
|
||||||
list_display = ['team', 'event', 'category', 'date']
|
# list_display = ['team', 'event', 'category', 'date']
|
||||||
list_filter = ['event', 'category']
|
# list_filter = ['event', 'category']
|
||||||
search_fields = ['team__team_name', 'event__event_name']
|
# search_fields = ['team__team_name', 'event__event_name']
|
||||||
|
|
||||||
@admin.register(Member)
|
@admin.register(Member)
|
||||||
class MemberAdmin(admin.ModelAdmin):
|
class MemberAdmin(admin.ModelAdmin):
|
||||||
|
|||||||
Reference in New Issue
Block a user