From 7c529211fdca2d1a05eeead2205b71e85390fe87 Mon Sep 17 00:00:00 2001 From: Alex Ottr Date: Sat, 6 Apr 2024 22:51:51 +0200 Subject: [PATCH] add fbl iteration and system user field --- fbl_integration/admin.py | 5 ++++- paw/__init__.py | 5 +++-- paw/templates/partials/logo.html | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/fbl_integration/admin.py b/fbl_integration/admin.py index c766727..98df4aa 100644 --- a/fbl_integration/admin.py +++ b/fbl_integration/admin.py @@ -3,8 +3,11 @@ from .models import FblAccount @admin.register(FblAccount) class FblAccountAdmin(admin.ModelAdmin): - list_display = ["username", "badge_number", "status", "tags_secured", "created_at"] + list_display = ["system_username", "username", "badge_number", "status", "tags_secured", "created_at"] search_fields = ["badge_number", "username"] list_filter = ["status"] readonly_fields = ["badge_number", "account_id", "username", "status", "tags_secured", "created_at"] + def system_username(self, x): + return x.user.username + system_username.short_description = 'System Username' diff --git a/paw/__init__.py b/paw/__init__.py index 71a898a..81999d2 100644 --- a/paw/__init__.py +++ b/paw/__init__.py @@ -1,5 +1,6 @@ from django import get_version -VERSION = (0, 5, 8, "final", 0) +PAW_VERSION = (0, 5, 8, "final", 0) +FBL_ITERATION = 2 -__version__ = get_version(VERSION) +__version__ = f"{get_version(PAW_VERSION)}-fbl{FBL_ITERATION}" diff --git a/paw/templates/partials/logo.html b/paw/templates/partials/logo.html index 00509da..28da6d9 100644 --- a/paw/templates/partials/logo.html +++ b/paw/templates/partials/logo.html @@ -3,6 +3,6 @@
- +
{% endblock %} \ No newline at end of file -- 2.51.2