1
0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00

new-admin: Negligible spacing change in d.c.m.init

git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-11-25 02:52:55 +00:00
parent efd3304e57
commit 8f5f9153f6

View File

@ -1825,20 +1825,20 @@ def manipulator_flatten_data(opts, klass, add, change, self):
new_data = {} new_data = {}
obj = change and self.original_object or None obj = change and self.original_object or None
for f in opts.get_data_holders(self.follow): for f in opts.get_data_holders(self.follow):
fol = self.follow.get(f.name) fol = self.follow.get(f.name)
new_data.update(f.flatten_data(fol, obj)) new_data.update(f.flatten_data(fol, obj))
return new_data return new_data
def manipulator_validator_unique_together(field_name_list, opts, self, field_data, all_data): def manipulator_validator_unique_together(field_name_list, opts, self, field_data, all_data):
from django.utils.text import get_text_list from django.utils.text import get_text_list
field_list = [opts.get_field(field_name) for field_name in field_name_list] field_list = [opts.get_field(field_name) for field_name in field_name_list]
if isinstance(field_list[0].rel, ManyToOne): if isinstance(field_list[0].rel, ManyToOne):
kwargs = {'%s__%s__iexact' % (field_name_list[0], field_list[0].rel.field_name): field_data} kwargs = {'%s__%s__iexact' % (field_name_list[0], field_list[0].rel.field_name): field_data}
else: else:
kwargs = {'%s__iexact' % field_name_list[0]: field_data} kwargs = {'%s__iexact' % field_name_list[0]: field_data}
for f in field_list[1:]: for f in field_list[1:]:
# This is really not going to work for fields that have different form fields, eg DateTime # This is really not going to work for fields that have different
# form fields, e.g. DateTime.
# This validation needs to occur after html2python to be effective. # This validation needs to occur after html2python to be effective.
field_val = all_data.get(f.attname, None) field_val = all_data.get(f.attname, None)
if field_val is None: if field_val is None: