Commit509c54d

committed

Merge pull request#3435 from stianjensen/unique-error

Use model error_messages when available

2 parentsc28bc98 +62c000b commit509c54dCopy full SHA for 509c54d

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,15 @@ def get_field_kwargs(field_name, model_field):`
`193`	`193`	`]`
`194`	`194`
`195`	`195`	`ifgetattr(model_field,'unique',False):`
`196`		`-validator=UniqueValidator(queryset=model_field.model._default_manager)`
	`196`	`+unique_error_message=model_field.error_messages.get('unique',None)`
	`197`	`+ifunique_error_message:`
	`198`	`+unique_error_message=unique_error_message% {`
	`199`	`+'model_name':model_field.model._meta.object_name,`
	`200`	`+'field_label':model_field.verbose_name`
	`201`	`+ }`
	`202`	`+validator=UniqueValidator(`
	`203`	`+queryset=model_field.model._default_manager,`
	`204`	`+message=unique_error_message)`
`197`	`205`	`validator_kwarg.append(validator)`
`198`	`206`
`199`	`207`	`ifvalidator_kwarg:`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ def test_is_not_unique(self):`
`48`	`48`	`data= {'username':'existing'}`
`49`	`49`	`serializer=UniquenessSerializer(data=data)`
`50`	`50`	`assertnotserializer.is_valid()`
`51`		`-assertserializer.errors== {'username': ['This field must be unique.']}`
	`51`	`+assertserializer.errors== {'username': ['UniquenessModel with this username already exists.']}`
`52`	`52`
`53`	`53`	`deftest_is_unique(self):`
`54`	`54`	`data= {'username':'other'}`

Comments

(0)