From 54f91a5bfb7fbfb885b09d50125d6614a5d541d7 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Fri, 23 Feb 2018 20:25:59 -0500 Subject: [PATCH] Simplify admin inline titles. More descriptive name format config admin list. --- allianceauth/authentication/admin.py | 2 ++ allianceauth/groupmanagement/admin.py | 2 ++ allianceauth/services/admin.py | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/allianceauth/authentication/admin.py b/allianceauth/authentication/admin.py index f63e9eb3..36e23540 100644 --- a/allianceauth/authentication/admin.py +++ b/allianceauth/authentication/admin.py @@ -55,6 +55,8 @@ class UserProfileInline(admin.StackedInline): model = UserProfile readonly_fields = ('state',) form = QuerysetModelForm + verbose_name = '' + verbose_name_plural = 'Profile' def get_formset(self, request, obj=None, **kwargs): # main_character field can only show current value or unclaimed alts diff --git a/allianceauth/groupmanagement/admin.py b/allianceauth/groupmanagement/admin.py index 5229379a..f6c64bfb 100644 --- a/allianceauth/groupmanagement/admin.py +++ b/allianceauth/groupmanagement/admin.py @@ -10,6 +10,8 @@ class AuthGroupInlineAdmin(admin.StackedInline): model = AuthGroup filter_horizontal = ('group_leaders',) fields = ('description', 'group_leaders', 'internal', 'hidden', 'open', 'public') + verbose_name_plural = 'Auth Settings' + verbose_name = '' def has_add_permission(self, request): return False diff --git a/allianceauth/services/admin.py b/allianceauth/services/admin.py index 7ee37294..d37a30fb 100644 --- a/allianceauth/services/admin.py +++ b/allianceauth/services/admin.py @@ -17,6 +17,11 @@ class NameFormatConfigForm(forms.ModelForm): class NameFormatConfigAdmin(admin.ModelAdmin): form = NameFormatConfigForm + list_display = ('service_name', 'get_state_display_string') + + def get_state_display_string(self, obj): + return ', '.join([state.name for state in obj.states.all()]) + get_state_display_string.short_description = 'States' admin.site.register(NameFormatConfig, NameFormatConfigAdmin)