From 4975fc98b874b2c310a4e3046d7542150846e660 Mon Sep 17 00:00:00 2001 From: Stephen Burrows Date: Wed, 27 Apr 2011 10:43:37 -0400 Subject: [PATCH] Moved philo media folder to static. Removed AddTagAdmin's reliance on django-staticmedia. --- admin/widgets.py | 15 ++++++--------- {media => static}/admin/js/TagCreation.js | 0 2 files changed, 6 insertions(+), 9 deletions(-) rename {media => static}/admin/js/TagCreation.js (100%) diff --git a/admin/widgets.py b/admin/widgets.py index aa0aa30..fb13ac7 100644 --- a/admin/widgets.py +++ b/admin/widgets.py @@ -48,15 +48,12 @@ class TagFilteredSelectMultiple(FilteredSelectMultiple): catalog has been loaded in the page """ class Media: - js = (settings.ADMIN_MEDIA_PREFIX + "js/core.js", - settings.ADMIN_MEDIA_PREFIX + "js/SelectBox.js", - settings.ADMIN_MEDIA_PREFIX + "js/SelectFilter2.js") - - if 'staticmedia' in settings.INSTALLED_APPS: - import staticmedia - js += (staticmedia.url('admin/js/TagCreation.js'),) - else: - js += (settings.ADMIN_MEDIA_PREFIX + "js/TagCreation.js",) + js = ( + settings.ADMIN_MEDIA_PREFIX + "js/core.js", + settings.ADMIN_MEDIA_PREFIX + "js/SelectBox.js", + settings.ADMIN_MEDIA_PREFIX + "js/SelectFilter2.js", + settings.ADMIN_MEDIA_PREFIX + "js/TagCreation.js", + ) def render(self, name, value, attrs=None, choices=()): if attrs is None: attrs = {} diff --git a/media/admin/js/TagCreation.js b/static/admin/js/TagCreation.js similarity index 100% rename from media/admin/js/TagCreation.js rename to static/admin/js/TagCreation.js -- 2.20.1