p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small formatting change to validation error in [516], to be consistent with other validation errors. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@517 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-08-16 18:28:00 +00:00
parent 7d374ad597
commit f21ff30b10
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/core/meta/fields.py
View File

@ -587,11 +587,11 @@ class ManyToManyField(Field):
else: else:
choices = self.get_choices(include_blank=False) choices = self.get_choices(include_blank=False)
return [curry(formfields.SelectMultipleField, size=min(max(len(choices), 5), 15), choices=choices)] return [curry(formfields.SelectMultipleField, size=min(max(len(choices), 5), 15), choices=choices)]
def get_m2m_db_table(self, original_opts): def get_m2m_db_table(self, original_opts):
"Returns the name of the many-to-many 'join' table." "Returns the name of the many-to-many 'join' table."
return '%s_%s' % (original_opts.db_table, self.name) return '%s_%s' % (original_opts.db_table, self.name)
def isValidIDList(self, field_data, all_data): def isValidIDList(self, field_data, all_data):
"Validates that the value is a valid list of foreign keys" "Validates that the value is a valid list of foreign keys"
mod = self.rel.to.get_model_module() mod = self.rel.to.get_model_module()
@ -603,9 +603,11 @@ class ManyToManyField(Field):
objects = mod.get_in_bulk(pks) objects = mod.get_in_bulk(pks)
if len(objects) != len(pks): if len(objects) != len(pks):
badkeys = [k for k in pks if k not in objects] badkeys = [k for k in pks if k not in objects]
raise validators.ValidationError, "Please enter valid %s IDs (the value%s %r %s invalid)" % \ raise validators.ValidationError, "Please enter valid %s IDs. The value%s %r %s invalid." % \
(self.verbose_name, len(badkeys) > 1 and 's' or '', len(badkeys) == 1 and badkeys[0] or tuple(badkeys), len(badkeys) == 1 and "is" or "are") (self.verbose_name, len(badkeys) > 1 and 's' or '',
len(badkeys) == 1 and badkeys[0] or tuple(badkeys),
len(badkeys) == 1 and "is" or "are")
class OneToOneField(IntegerField): class OneToOneField(IntegerField):
def __init__(self, to, to_field=None, rel_name=None, **kwargs): def __init__(self, to, to_field=None, rel_name=None, **kwargs):
kwargs['name'] = kwargs.get('name', 'id') kwargs['name'] = kwargs.get('name', 'id')