From f2d7a2dfd849b9a7488fdcf0601e927973121322 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Mon, 15 Jan 2018 19:07:19 +0100 Subject: [PATCH] =?UTF-8?q?Ajout=20du=20champ=20'shortname'=20=C3=A0=20Gam?= =?UTF-8?q?es=20et=20Figurines?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- collection/figurines/admin.py | 8 +++---- collection/games/admin.py | 42 ++++++++++++++++------------------- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/collection/figurines/admin.py b/collection/figurines/admin.py index 77dc33e..1dce616 100644 --- a/collection/figurines/admin.py +++ b/collection/figurines/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from django.utils.translation import ugettext as _ -from figurines.models import Set, Figurine +from figurines.models import Figurine +from figurines.models import Set class FigurineInline(admin.TabularInline): @@ -10,8 +10,8 @@ class FigurineInline(admin.TabularInline): class SetAdmin(admin.ModelAdmin): - list_display = ('name',) - inlines = (FigurineInline,) + list_display = ('shortname', 'name') + inlines = (FigurineInline, ) admin.site.register(Set, SetAdmin) diff --git a/collection/games/admin.py b/collection/games/admin.py index 8412e80..12d474d 100644 --- a/collection/games/admin.py +++ b/collection/games/admin.py @@ -1,7 +1,13 @@ from django.contrib import admin from django.utils.translation import ugettext as _ from games.forms import GameForm -from games.models import Game, Platform, Timeline +from games.models import Game +from games.models import Platform +from games.models import Timeline + + +class PlatformAdmin(admin.ModelAdmin): + list_display = ('shortname', 'name') class StatusFilter(admin.SimpleListFilter): @@ -28,34 +34,24 @@ class StatusFilter(admin.SimpleListFilter): class GameAdmin(admin.ModelAdmin): - list_display = ( - 'name', 'playing', 'status', 'wish') - list_filter = [ - StatusFilter, - 'playing', - 'wish'] - search_fields = ('name',) - fieldsets = [ - (_('Game Information'), { - 'fields': [ - ('name', 'collection')]}), - (_('Progress'), - {'fields': [ - ('status'), - ('note')]}), - ('', - {'fields': [ - ('playing'), ('unplayed'), ('wish')]}) - ] + list_display = ('name', 'playing', 'status', 'wish') + list_filter = [StatusFilter, 'playing', 'wish'] + search_fields = ('name', ) + fieldsets = [(_('Game Information'), { + 'fields': [('name', 'collection')] + }), (_('Progress'), { + 'fields': [('status'), ('note')] + }), ('', { + 'fields': [('playing'), ('unplayed'), ('wish')] + })] form = GameForm class TimelineAdmin(admin.ModelAdmin): - list_display = ( - 'date', 'status', 'item') + list_display = ('date', 'status', 'item') -admin.site.register(Platform) +admin.site.register(Platform, PlatformAdmin) admin.site.register(Game, GameAdmin) admin.site.register(Timeline, TimelineAdmin)