Skip to content
Open
Changes from all commits
Commits
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: 4 additions & 3 deletions locking/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import django
from django import forms
from django.contrib.admin.templatetags.admin_static import static
from django.core.urlresolvers import reverse
from django.utils import html as html_utils
from django.utils.functional import curry
Expand All @@ -24,7 +25,7 @@ class TemplateResponse(object): pass

from .models import Lock
from .forms import locking_form_factory
from . import settings as locking_settings, views as locking_views
from . import views as locking_views


json_encode = json.JSONEncoder(indent=4).encode
Expand All @@ -38,10 +39,10 @@ class LockableAdminMixin(object):
def media(self):
return super(LockableAdminMixin, self).media + forms.Media(**{
'js': (
locking_settings.STATIC_URL + "locking/js/admin.locking.js?v=6",
static('locking/js/admin.locking.js'),
),
'css': {
'all': (locking_settings.STATIC_URL + 'locking/css/locking.css',),
'all': (static('locking/css/locking.css'),),
}})

def locking_media(self, obj=None):
Expand Down