Merge branch 'master' of git://github.com/melinath/philo

[philo.git] / philo / admin / widgets.py

diff --git a/philo/admin/widgets.py b/philo/admin/widgets.py
index fb13ac7..c753850 100644 (file)
--- a/philo/admin/widgets.py
+++ b/philo/admin/widgets.py
@@ -1,10 +1,10 @@
 from django import forms
 from django.conf import settings
 from django.contrib.admin.widgets import FilteredSelectMultiple, url_params_from_lookup_dict
 from django import forms
 from django.conf import settings
 from django.contrib.admin.widgets import FilteredSelectMultiple, url_params_from_lookup_dict

-from django.utils.translation import ugettext as _
+from django.utils.html import escape

 from django.utils.safestring import mark_safe
 from django.utils.text import truncate_words
 from django.utils.safestring import mark_safe
 from django.utils.text import truncate_words

-from django.utils.html import escape
+from django.utils.translation import ugettext as _

 
 
 class ModelLookupWidget(forms.TextInput):
 
 
 class ModelLookupWidget(forms.TextInput):


@@ -52,7 +52,7 @@ class TagFilteredSelectMultiple(FilteredSelectMultiple):
                        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/core.js",
                        settings.ADMIN_MEDIA_PREFIX + "js/SelectBox.js",
                        settings.ADMIN_MEDIA_PREFIX + "js/SelectFilter2.js",

-                       settings.ADMIN_MEDIA_PREFIX + "js/TagCreation.js",
+                       "philo/js/TagCreation.js",

                )
 
        def render(self, name, value, attrs=None, choices=()):
                )
 
        def render(self, name, value, attrs=None, choices=()):