From 079696beb965f3972c9f181c5d4044af17be0a4f Mon Sep 17 00:00:00 2001 From: James Socol Date: Thu, 14 Jun 2012 12:49:56 -0400 Subject: [PATCH] Clarify where data in UserProfileAdmin comes from. Makes callables on the UserProfile model look distinct from typical double-underscore lookups. Different options on ModelAdmin behave differently, so this should make it clearer which option is using which data source. --- apps/users/admin.py | 8 ++++---- apps/users/models.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/users/admin.py b/apps/users/admin.py index 3105f268d..afc547c02 100644 --- a/apps/users/admin.py +++ b/apps/users/admin.py @@ -6,12 +6,12 @@ class UserProfileAdmin(AdminImageMixin, admin.ModelAdmin): - fields = ['user', 'user__email', 'display_name', 'photo', 'ircname', + fields = ['user', 'user_email', 'display_name', 'photo', 'ircname', 'is_vouched', 'vouched_by', 'bio', 'website', 'groups', 'skills'] - list_display = ['display_name', 'user__email', 'user__username', 'ircname', + list_display = ['display_name', 'user_email', 'user_username', 'ircname', 'is_vouched', 'vouched_by'] - list_display_links = ['display_name', 'user__email', 'user__username'] - readonly_fields = ['user', 'user__email'] + list_display_links = ['display_name', 'user_email', 'user_username'] + readonly_fields = ['user', 'user_email'] save_on_top = True search_fields = ['display_name', 'user__email', 'user__username', 'ircname'] diff --git a/apps/users/models.py b/apps/users/models.py index 106982526..f907f6aee 100644 --- a/apps/users/models.py +++ b/apps/users/models.py @@ -75,10 +75,10 @@ def __unicode__(self): def get_absolute_url(self): return reverse('profile', args=[self.user.username]) - def user__email(self): + def user_email(self): return self.user.email - def user__username(self): + def user_username(self): return self.user.username def anonymize(self):