Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
f0f61aa0
Commit
f0f61aa0
authored
Jul 26, 2016
by
Sassan Haradji
Committed by
Tom Christie
Jul 26, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use verbose_name instead of object_name in field_mapping (#4299)
* use verbose_name instead of object_name in error messages
parent
b6309908
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
rest_framework/utils/field_mapping.py
+1
-1
tests/test_validators.py
+1
-1
No files found.
rest_framework/utils/field_mapping.py
View file @
f0f61aa0
...
@@ -220,7 +220,7 @@ def get_field_kwargs(field_name, model_field):
...
@@ -220,7 +220,7 @@ def get_field_kwargs(field_name, model_field):
unique_error_message
=
model_field
.
error_messages
.
get
(
'unique'
,
None
)
unique_error_message
=
model_field
.
error_messages
.
get
(
'unique'
,
None
)
if
unique_error_message
:
if
unique_error_message
:
unique_error_message
=
unique_error_message
%
{
unique_error_message
=
unique_error_message
%
{
'model_name'
:
model_field
.
model
.
_meta
.
object
_name
,
'model_name'
:
model_field
.
model
.
_meta
.
verbose
_name
,
'field_label'
:
model_field
.
verbose_name
'field_label'
:
model_field
.
verbose_name
}
}
validator
=
UniqueValidator
(
validator
=
UniqueValidator
(
...
...
tests/test_validators.py
View file @
f0f61aa0
...
@@ -77,7 +77,7 @@ class TestUniquenessValidation(TestCase):
...
@@ -77,7 +77,7 @@ class TestUniquenessValidation(TestCase):
data
=
{
'username'
:
'existing'
}
data
=
{
'username'
:
'existing'
}
serializer
=
UniquenessSerializer
(
data
=
data
)
serializer
=
UniquenessSerializer
(
data
=
data
)
assert
not
serializer
.
is_valid
()
assert
not
serializer
.
is_valid
()
assert
serializer
.
errors
==
{
'username'
:
[
'
UniquenessM
odel with this username already exists.'
]}
assert
serializer
.
errors
==
{
'username'
:
[
'
uniqueness m
odel with this username already exists.'
]}
def
test_is_unique
(
self
):
def
test_is_unique
(
self
):
data
=
{
'username'
:
'other'
}
data
=
{
'username'
:
'other'
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment