From f4bc6011886829adcecee8ba46e293b52016a01d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Marti=CC=81n?= Date: Mon, 26 Jan 2015 14:41:55 +0100 Subject: [PATCH] AccessCode: Some admin goodies --- shelfzilla/apps/account/admin.py | 8 ++++++-- shelfzilla/apps/account/models.py | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/shelfzilla/apps/account/admin.py b/shelfzilla/apps/account/admin.py index 8fd9d14..5d13745 100644 --- a/shelfzilla/apps/account/admin.py +++ b/shelfzilla/apps/account/admin.py @@ -106,10 +106,14 @@ admin.site.register(Permission) class AccessCodeAdmin(admin.ModelAdmin): - list_display = ('code', 'max_uses', 'used_by', 'expiration', 'active', 'usable') + list_display = ('code', 'max_uses', 'expiration', 'active', 'uses', + 'usable') + + def uses(self, obj): + return obj.uses def usable(self, obj): - return obj.usabe + return obj.usable usable.boolean = True admin.site.register(models.AccessCode, AccessCodeAdmin) diff --git a/shelfzilla/apps/account/models.py b/shelfzilla/apps/account/models.py index 75faeb4..88094b1 100644 --- a/shelfzilla/apps/account/models.py +++ b/shelfzilla/apps/account/models.py @@ -155,6 +155,10 @@ class AccessCode(models.Model): def __unicode__(self): return self.code + @property + def uses(self): + return self.used_by.count() + @property def usable(self): # Check if active