Commit e4bd5e8a authored by Justin Bronn's avatar Justin Bronn
Browse files

[1.2.X] Fixed #13149 -- The admin `ForeignKeyRawIdWidget` now properly handles... 

[1.2.X] Fixed #13149 -- The admin `ForeignKeyRawIdWidget` now properly handles non-integer values.  Thanks, Chris Adams.

Backport of r13751 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13752 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent f4ebd701

django/contrib/admin/widgets.py

+3 −3
Original line number Diff line number Diff line
@@ -154,9 +154,9 @@ class ForeignKeyRawIdWidget(forms.TextInput): 
        key = self.rel.get_related_field().name

        try:

            obj = self.rel.to._default_manager.using(self.db).get(**{key: value})

        except self.rel.to.DoesNotExist:

            return ''

            return '&nbsp;<strong>%s</strong>' % escape(truncate_words(obj, 14))

        except (ValueError, self.rel.to.DoesNotExist):

            return ''



class ManyToManyRawIdWidget(ForeignKeyRawIdWidget):

    """
@@ -169,7 +169,7 @@ class ManyToManyRawIdWidget(ForeignKeyRawIdWidget): 
    def render(self, name, value, attrs=None):

        attrs['class'] = 'vManyToManyRawIdAdminField'

        if value:

            value = ','.join([str(v) for v in value])

            value = ','.join([force_unicode(v) for v in value])

        else:

            value = ''

        return super(ManyToManyRawIdWidget, self).render(name, value, attrs)

django/forms/models.py

+1 −1
Original line number Diff line number Diff line
@@ -996,7 +996,7 @@ class ModelChoiceField(ChoiceField): 
        try:

            key = self.to_field_name or 'pk'

            value = self.queryset.get(**{key: value})

        except self.queryset.model.DoesNotExist:

        except (ValueError, self.queryset.model.DoesNotExist):

            raise ValidationError(self.error_messages['invalid_choice'])

        return value

tests/regressiontests/admin_widgets/tests.py

+12 −0
Original line number Diff line number Diff line 
# encoding: utf-8



from django import forms

from django.contrib import admin

from django.contrib.admin import widgets
@@ -151,3 +153,13 @@ class AdminForeignKeyRawIdWidget(DjangoTestCase): 
            post_data)

        self.assertContains(response,

            'Select a valid choice. That choice is not one of the available choices.')



    def test_invalid_target_id(self):



        for test_str in ('Iñtërnâtiônàlizætiøn', "1234'", -1234):

            # This should result in an error message, not a server exception.

            response = self.client.post('%s/admin_widgets/event/add/' % self.admin_root,

                {"band": test_str})



            self.assertContains(response,

                'Select a valid choice. That choice is not one of the available choices.')