diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2006-09-26 10:19:40 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2006-09-26 10:19:40 +0000 |
| commit | 5371ee1743dcfc6322dafeb292618c0405c00510 (patch) | |
| tree | 81c61b2b9b7f15e70a1a2e1b445afc9be7b6959d | |
| parent | e149c8bb8742adb4a93c8bb39c7fd69320abaf7b (diff) | |
Fixed #2194 -- Tweaked error message for unique_together validator to display
all verbose field names. Patch from dackze+django@gmail.com.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | django/db/models/manipulators.py | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -64,6 +64,7 @@ answer newbie questions, and generally made Django that much better: Ian Clelland <clelland@gmail.com> crankycoder@gmail.com Matt Croydon <http://www.postneo.com/> + dackze+django@gmail.com Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/> Jason Davies (Esaj) <http://www.jasondavies.com/> Alex Dedul diff --git a/django/db/models/manipulators.py b/django/db/models/manipulators.py index faf453b86b..c33e703da1 100644 --- a/django/db/models/manipulators.py +++ b/django/db/models/manipulators.py @@ -300,7 +300,7 @@ def manipulator_validator_unique_together(field_name_list, opts, self, field_dat pass else: raise validators.ValidationError, _("%(object)s with this %(type)s already exists for the given %(field)s.") % \ - {'object': capfirst(opts.verbose_name), 'type': field_list[0].verbose_name, 'field': get_text_list(field_name_list[1:], 'and')} + {'object': capfirst(opts.verbose_name), 'type': field_list[0].verbose_name, 'field': get_text_list([f.verbose_name for f in field_list[1:]], 'and')} def manipulator_validator_unique_for_date(from_field, date_field, opts, lookup_type, self, field_data, all_data): from django.db.models.fields.related import ManyToOneRel |