Skip to content

Call super to add in ModelAdmin media before adding django-locking media #21

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
lllama wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Call super to add in ModelAdmin media before adding django-locking media #21

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
7 changes: 5 additions & 2 deletions locking/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ def media(self):
#
# See http://docs.djangoproject.com/en/dev/topics/forms/media/#media-as-a-dynamic-property
# for more information about dynamic media definitions.

## Pull in admin media from ModelAdmin
super_media = super(LockableAdmin, self)._media()

css = {
'all': ('locking/css/locking.css',)
Expand All @@ -35,7 +38,7 @@ def media(self):
'locking/js/admin.locking.js',
)

return forms.Media(css=css, js=js)
return super_media + forms.Media(css=css, js=js)

def changelist_view(self, request, extra_context=None):
# we need the request objects in a few places where it's usually not present,
Expand Down Expand Up @@ -70,4 +73,4 @@ def lock(self, obj):
return ''
lock.allow_tags = True

list_display = ('__str__', 'lock')
list_display = ('__str__', 'lock')