Added support for limit_choices_to use in the ModelLookupWidget and switched its...

diff --git a/admin/widgets.py b/admin/widgets.py
index 7a47c63..aa0aa30 100644 (file)
--- a/admin/widgets.py
+++ b/admin/widgets.py
@@ -1,6 +1,6 @@
 from django import forms
 from django.conf import settings
-from django.contrib.admin.widgets import FilteredSelectMultiple
+from django.contrib.admin.widgets import FilteredSelectMultiple, url_params_from_lookup_dict
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from django.utils.text import truncate_words
@@ -10,28 +10,34 @@ from django.utils.html import escape
 class ModelLookupWidget(forms.TextInput):
        # is_hidden = False
        
-       def __init__(self, content_type, attrs=None):
+       def __init__(self, content_type, attrs=None, limit_choices_to=None):
                self.content_type = content_type
+               self.limit_choices_to = limit_choices_to
                super(ModelLookupWidget, self).__init__(attrs)
        
        def render(self, name, value, attrs=None):
                related_url = '../../../%s/%s/' % (self.content_type.app_label, self.content_type.model)
+               params = url_params_from_lookup_dict(self.limit_choices_to)
+               if params:
+                       url = u'?' + u'&'.join([u'%s=%s' % (k, v) for k, v in params.items()])
+               else:
+                       url = u''
                if attrs is None:
                        attrs = {}
-               if not attrs.has_key('class'):
+               if "class" not in attrs:
                        attrs['class'] = 'vForeignKeyRawIdAdminField'
-               output = super(ModelLookupWidget, self).render(name, value, attrs)
-               output += '<a href="%s" class="related-lookup" id="lookup_id_%s" onclick="return showRelatedObjectLookupPopup(this);">' % (related_url, name)
-               output += '<img src="%simg/admin/selector-search.gif" width="16" height="16" alt="%s" />' % (settings.ADMIN_MEDIA_PREFIX, _('Lookup'))
-               output += '</a>'
+               output = [super(ModelLookupWidget, self).render(name, value, attrs)]
+               output.append('<a href="%s%s" class="related-lookup" id="lookup_id_%s" onclick="return showRelatedObjectLookupPopup(this);">' % (related_url, url, name))
+               output.append('<img src="%simg/admin/selector-search.gif" width="16" height="16" alt="%s" />' % (settings.ADMIN_MEDIA_PREFIX, _('Lookup')))
+               output.append('</a>')
                if value:
                        value_class = self.content_type.model_class()
                        try:
                                value_object = value_class.objects.get(pk=value)
-                               output += '&nbsp;<strong>%s</strong>' % escape(truncate_words(value_object, 14))
+                               output.append('&nbsp;<strong>%s</strong>' % escape(truncate_words(value_object, 14)))
                        except value_class.DoesNotExist:
                                pass
-               return mark_safe(output)
+               return mark_safe(u''.join(output))
 
 
 class TagFilteredSelectMultiple(FilteredSelectMultiple):

diff --git a/models/pages.py b/models/pages.py
index 86db88f..2221ee4 100644 (file)
--- a/models/pages.py
+++ b/models/pages.py
@@ -171,6 +171,9 @@ class Page(View):
                return self.title
        
        def clean_fields(self, exclude=None):
+               if exclude is None:
+                       exclude = []
+               
                try:
                        super(Page, self).clean_fields(exclude)
                except ValidationError, e: