mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-04 10:59:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #24505 -- Fixed clash with hidden m2m fields.

Browse source 
Added support for multiple m2m fields with the same 'to' model
and with related_name set to '+'.
This commit is contained in:
Marco Fucci 2015-03-26 18:47:07 +00:00 • committed by Tim Graham
parent 14f28f8233
commit 4ee08958f1
5 changed files with 40 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tests/model_meta/results.py
View file

@ -319,7 +319,7 @@ TEST_RESULTS = {
'get_all_related_objects_with_model_hidden_local': {
Person: (
('+', None),
('+', None),
('_people_hidden_+', None),
('Person_following_inherited+', None),
('Person_following_inherited+', None),
('Person_friends_inherited+', None),
@ -334,7 +334,7 @@ TEST_RESULTS = {
),
BasePerson: (
('+', None),
('+', None),
('_basepeople_hidden_+', None),
('BasePerson_following_abstract+', None),
('BasePerson_following_abstract+', None),
('BasePerson_following_base+', None),
@ -380,10 +380,10 @@ TEST_RESULTS = {
},
'get_all_related_objects_with_model_hidden': {
Person: (
('+', BasePerson),
('+', BasePerson),
('+', None),
('+', None),
('_basepeople_hidden_+', BasePerson),
('_people_hidden_+', None),
('BasePerson_following_abstract+', BasePerson),
('BasePerson_following_abstract+', BasePerson),
('BasePerson_following_base+', BasePerson),
@ -416,7 +416,7 @@ TEST_RESULTS = {
),
BasePerson: (
('+', None),
('+', None),
('_basepeople_hidden_+', None),
('BasePerson_following_abstract+', None),
('BasePerson_following_abstract+', None),
('BasePerson_following_base+', None),
@ -730,7 +730,7 @@ TEST_RESULTS = {
('friends_base_rel_+', None),
('followers_base', None),
('relating_basepeople', None),
('+', None),
('_basepeople_hidden_+', None),
),
Person: (
('friends_abstract_rel_+', BasePerson),
@ -738,11 +738,11 @@ TEST_RESULTS = {
('friends_base_rel_+', BasePerson),
('followers_base', BasePerson),
('relating_basepeople', BasePerson),
('+', BasePerson),
('_basepeople_hidden_+', BasePerson),
('friends_inherited_rel_+', None),
('followers_concrete', None),
('relating_people', None),
('+', None),
('_people_hidden_+', None),
),
Relation: (
('m2m_abstract_rel', None),
@ -757,13 +757,13 @@ TEST_RESULTS = {
'friends_base_rel_+',
'followers_base',
'relating_basepeople',
'+',
'_basepeople_hidden_+',
],
Person: [
'friends_inherited_rel_+',
'followers_concrete',
'relating_people',
'+',
'_people_hidden_+',
],
Relation: [
'm2m_abstract_rel',