1
0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00

magic-removal: Fixed #1367 -- Got unique_together validator working. Thanks, Christopher Lenz

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2315 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-02-17 17:20:48 +00:00
parent ad24403e8b
commit 37942803b0

View File

@ -6,6 +6,7 @@ from django.dispatch import dispatcher
from django.db.models import signals from django.db.models import signals
from django.utils.functional import curry from django.utils.functional import curry
from django.utils.datastructures import DotExpandedDict, MultiValueDict from django.utils.datastructures import DotExpandedDict, MultiValueDict
from django.utils.text import capfirst
import types import types
def add_manipulators(sender): def add_manipulators(sender):
@ -291,9 +292,8 @@ def manipulator_validator_unique_together(field_name_list, opts, self, field_dat
kwargs['%s__pk' % f.name] = field_val kwargs['%s__pk' % f.name] = field_val
else: else:
kwargs['%s__iexact' % f.name] = field_val kwargs['%s__iexact' % f.name] = field_val
mod = opts.get_model_module()
try: try:
old_obj = mod.get_object(**kwargs) old_obj = self.manager.get(**kwargs)
except ObjectDoesNotExist: except ObjectDoesNotExist:
return return
if hasattr(self, 'original_object') and self.original_object._get_pk_val() == old_obj._get_pk_val(): if hasattr(self, 'original_object') and self.original_object._get_pk_val() == old_obj._get_pk_val():