mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-23 01:25:58 +00:00
Code Issues 25 Releases Wiki Activity

Fixed #24940 -- Made model managers hashable

Browse Source 
Thanks Federico Jaramillo Martínez for the report and Tim Graham for the
test and review.
This commit is contained in:
Markus Holtermann 2015-06-18 21:57:08 +02:00
parent 200e06a5ee
commit d3d66d4722
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/models/manager.py
View File

@ -234,6 +234,9 @@ class BaseManager(object):
def __ne__(self, other): def __ne__(self, other):
return not (self == other) return not (self == other)
def __hash__(self):
return id(self)
class Manager(BaseManager.from_queryset(QuerySet)): class Manager(BaseManager.from_queryset(QuerySet)):
pass pass

3
docs/releases/1.8.3.txt
View File

@ -74,3 +74,6 @@ Bugfixes
* Fixed crash when uploading images with MIME types that Pillow doesn't detect, * Fixed crash when uploading images with MIME types that Pillow doesn't detect,
such as bitmap, in ``forms.ImageField`` (:ticket:`24948`). such as bitmap, in ``forms.ImageField`` (:ticket:`24948`).
* Fixed a regression when deleting a model through the admin that has a
``GenericRelation`` with a ``related_query_name`` (:ticket:`24940`).

2
tests/generic_inline_admin/models.py
View File

@ -48,7 +48,7 @@ class PhoneNumber(models.Model):
class Contact(models.Model): class Contact(models.Model):
name = models.CharField(max_length=50) name = models.CharField(max_length=50)
phone_numbers = GenericRelation(PhoneNumber) phone_numbers = GenericRelation(PhoneNumber, related_query_name='phone_numbers')
# #

14
tests/generic_inline_admin/tests.py
View File

@ -8,6 +8,7 @@ from django.contrib.admin.sites import AdminSite
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.contenttypes.admin import GenericTabularInline from django.contrib.contenttypes.admin import GenericTabularInline
from django.contrib.contenttypes.forms import generic_inlineformset_factory from django.contrib.contenttypes.forms import generic_inlineformset_factory
from django.contrib.contenttypes.models import ContentType
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.forms.formsets import DEFAULT_MAX_NUM from django.forms.formsets import DEFAULT_MAX_NUM
from django.forms.models import ModelForm from django.forms.models import ModelForm
@ -16,7 +17,7 @@ from django.test import (
) )
from .admin import MediaInline, MediaPermanentInline, site as admin_site from .admin import MediaInline, MediaPermanentInline, site as admin_site
from .models import Category, Episode, EpisodePermanent, Media from .models import Category, Episode, EpisodePermanent, Media, PhoneNumber
class TestDataMixin(object): class TestDataMixin(object):
@ -313,6 +314,17 @@ class GenericInlineAdminWithUniqueTogetherTest(TestDataMixin, TestCase):
response = self.client.post(reverse('admin:generic_inline_admin_contact_add'), post_data) response = self.client.post(reverse('admin:generic_inline_admin_contact_add'), post_data)
self.assertEqual(response.status_code, 302) # redirect somewhere self.assertEqual(response.status_code, 302) # redirect somewhere
def test_delete(self):
from .models import Contact
c = Contact.objects.create(name='foo')
PhoneNumber.objects.create(
object_id=c.id,
content_type=ContentType.objects.get_for_model(Contact),
phone_number="555-555-5555",
)
response = self.client.post(reverse('admin:generic_inline_admin_contact_delete', args=[c.pk]))
self.assertContains(response, 'Are you sure you want to delete')
@override_settings(ROOT_URLCONF="generic_inline_admin.urls") @override_settings(ROOT_URLCONF="generic_inline_admin.urls")
class NoInlineDeletionTest(SimpleTestCase): class NoInlineDeletionTest(SimpleTestCase):