innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[2.0.x] Fixed #28898 -- Corrected admin check to allow a OneToOneField in ModelAdmin.autocomplete_fields. 

Backport of 30a389bd77 from master
This commit is contained in:
Rodrigo Pinheiro Marques de Araújo 2017-12-13 04:39:27 -03:00 committed by Tim Graham
parent ce26ec0163
commit 9f39f202ab
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -687,6 +687,7 @@ answer newbie questions, and generally made Django that much better:
Robert Wittams Robert Wittams
Rob Hudson <http://rob.cogit8.org/> Rob Hudson <http://rob.cogit8.org/>
Robin Munn <http://www.geekforgod.com/> Robin Munn <http://www.geekforgod.com/>
Rodrigo Pinheiro Marques de Araújo <fenrrir@gmail.com>
Romain Garrigues <romain.garrigues.cs@gmail.com> Romain Garrigues <romain.garrigues.cs@gmail.com>
Ronny Haryanto <http://ronny.haryan.to/> Ronny Haryanto <http://ronny.haryan.to/>
Ross Poulton <ross@rossp.org> Ross Poulton <ross@rossp.org>

2
django/contrib/admin/checks.py
View File

@ -104,7 +104,7 @@ class BaseModelAdminChecks:
except FieldDoesNotExist: except FieldDoesNotExist:
return refer_to_missing_field(field=field_name, option=label, model=model, obj=obj, id='admin.E037') return refer_to_missing_field(field=field_name, option=label, model=model, obj=obj, id='admin.E037')
else: else:
if not (field.many_to_many or field.many_to_one): if not field.many_to_many and not isinstance(field, models.ForeignKey):
return must_be( return must_be(
'a foreign key or a many-to-many field', 'a foreign key or a many-to-many field',
option=label, obj=obj, id='admin.E038' option=label, obj=obj, id='admin.E038'

3
docs/releases/2.0.1.txt
View File

@ -23,3 +23,6 @@ Bugfixes
(:ticket:`28856`). (:ticket:`28856`).
* Reallowed filtering a queryset with ``GeometryField=None`` (:ticket:`28896`). * Reallowed filtering a queryset with ``GeometryField=None`` (:ticket:`28896`).
* Corrected admin check to allow a ``OneToOneField`` in
``ModelAdmin.autocomplete_fields`` (:ticket:`28898`).

15
tests/modeladmin/test_checks.py
View File

@ -6,7 +6,9 @@ from django.core.checks import Error
from django.forms.models import BaseModelFormSet from django.forms.models import BaseModelFormSet
from django.test import SimpleTestCase from django.test import SimpleTestCase
from .models import Band, Song, ValidationTestInlineModel, ValidationTestModel from .models import (
Band, Song, User, ValidationTestInlineModel, ValidationTestModel,
)
class CheckTestCase(SimpleTestCase): class CheckTestCase(SimpleTestCase):
@ -1243,3 +1245,14 @@ class AutocompleteFieldsTests(CheckTestCase):
site = AdminSite() site = AdminSite()
site.register(Band, SearchFieldsAdmin) site.register(Band, SearchFieldsAdmin)
self.assertIsValid(AutocompleteAdmin, Song, admin_site=site) self.assertIsValid(AutocompleteAdmin, Song, admin_site=site)
def test_autocomplete_is_onetoone(self):
class UserAdmin(ModelAdmin):
search_fields = ('name', )
class Admin(ModelAdmin):
autocomplete_fields = ('best_friend', )
site = AdminSite()
site.register(User, UserAdmin)
self.assertIsValid(Admin, ValidationTestModel, admin_site=site)