Moved philo media folder to static. Removed AddTagAdmin's reliance on django-staticmedia.
authorStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 27 Apr 2011 14:43:37 +0000 (10:43 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 27 Apr 2011 14:43:37 +0000 (10:43 -0400)
admin/widgets.py
static/admin/js/TagCreation.js [moved from media/admin/js/TagCreation.js with 100% similarity]

index aa0aa30..fb13ac7 100644 (file)
@@ -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 = {}