Skip to content

Fix admin search by USERNAME_FIELD #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix admin search by USERNAME_FIELD #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions machina/apps/forum_member/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,23 @@
"""

from django.contrib import admin
from django.contrib.auth import get_user_model

from machina.core.db.models import get_model
from machina.models.fields import MarkupTextField, MarkupTextFieldWidget


ForumProfile = get_model('forum_member', 'ForumProfile')
USERNAME_FIELD = get_user_model().USERNAME_FIELD


class ForumProfileAdmin(admin.ModelAdmin):
""" The Forum Profile model admin. """

list_display = ('id', 'user', 'posts_count', )
list_filter = ('posts_count', )
list_display_links = ('id', 'user', )
raw_id_fields = ('user', )
search_fields = ('user__username',)
list_display = ('id', 'user', 'posts_count',)
list_filter = ('posts_count',)
list_display_links = ('id', 'user',)
raw_id_fields = ('user',)
search_fields = ('user__%s' % USERNAME_FIELD,)

formfield_overrides = {
MarkupTextField: {'widget': MarkupTextFieldWidget},
Expand Down
21 changes: 11 additions & 10 deletions machina/apps/forum_permission/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,37 @@
"""

from django.contrib import admin
from django.contrib.auth import get_user_model

from machina.core.db.models import get_model


ForumPermission = get_model('forum_permission', 'ForumPermission')
GroupForumPermission = get_model('forum_permission', 'GroupForumPermission')
UserForumPermission = get_model('forum_permission', 'UserForumPermission')
USERNAME_FIELD = get_user_model().USERNAME_FIELD


class ForumPermissionAdmin(admin.ModelAdmin):
""" The Forum Permission model admin. """

search_fields = ('codename', )
list_display = ('name', 'codename', )
search_fields = ('codename',)
list_display = ('name', 'codename',)


class GroupForumPermissionAdmin(admin.ModelAdmin):
""" The Group Forum Permission model admin. """

search_fields = ('permission__codename', 'group__name', )
list_display = ('group', 'forum', 'permission', 'has_perm', )
list_editables = ('has_perm', )
raw_id_fields = ('group', )
search_fields = ('permission__codename', 'group__name',)
list_display = ('group', 'forum', 'permission', 'has_perm',)
list_editables = ('has_perm',)
raw_id_fields = ('group',)
list_filter = ['forum', 'group']


class UserForumPermissionAdmin(admin.ModelAdmin):
""" The User Forum Permission model admin. """

search_fields = ('permission__codename', 'user__username', )
search_fields = ('permission__codename', 'user__%s' % USERNAME_FIELD,)
list_display = (
'user',
'anonymous_user',
Expand All @@ -45,8 +46,8 @@ class UserForumPermissionAdmin(admin.ModelAdmin):
'permission',
'has_perm',
)
list_editables = ('has_perm', )
raw_id_fields = ('user', )
list_editables = ('has_perm',)
raw_id_fields = ('user',)
list_filter = ['forum']


Expand Down