Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
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
edx-platform
Commits
df7e1ab9
Commit
df7e1ab9
authored
Jun 25, 2014
by
Zia Fazal
Committed by
Jonathan Piacenti
Aug 20, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added created field to users api
parent
53745611
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletions
+6
-1
lms/djangoapps/api_manager/users/serializers.py
+2
-1
lms/djangoapps/api_manager/users/tests.py
+3
-0
lms/djangoapps/api_manager/users/views.py
+1
-0
No files found.
lms/djangoapps/api_manager/users/serializers.py
View file @
df7e1ab9
...
...
@@ -8,11 +8,12 @@ from api_manager.organizations.serializers import BasicOrganizationSerializer
class
UserSerializer
(
serializers
.
ModelSerializer
):
""" Serializer for User model interactions """
organizations
=
BasicOrganizationSerializer
(
many
=
True
,
required
=
False
)
created
=
serializers
.
DateTimeField
(
source
=
'date_joined'
,
required
=
False
)
class
Meta
:
""" Serializer/field specification """
model
=
APIUser
fields
=
(
"id"
,
"email"
,
"username"
,
"first_name"
,
"last_name"
,
"organizations"
)
fields
=
(
"id"
,
"email"
,
"username"
,
"first_name"
,
"last_name"
,
"
created"
,
"
organizations"
)
read_only_fields
=
(
"id"
,
"email"
,
"username"
)
...
...
lms/djangoapps/api_manager/users/tests.py
View file @
df7e1ab9
...
...
@@ -156,6 +156,7 @@ class UsersApiTests(TestCase):
self
.
assertIsNotNone
(
response
.
data
[
'results'
][
0
][
'organizations'
][
0
][
'name'
])
self
.
assertIsNotNone
(
response
.
data
[
'results'
][
0
][
'organizations'
][
0
][
'id'
])
self
.
assertIsNotNone
(
response
.
data
[
'results'
][
0
][
'organizations'
][
0
][
'url'
])
self
.
assertIsNotNone
(
response
.
data
[
'results'
][
0
][
'created'
])
# fetch user data by multiple ids
response
=
self
.
do_get
(
'{}?page_size=5&ids={}'
.
format
(
test_uri
,
'2,3,7,11,6,21,34'
))
self
.
assertEqual
(
response
.
status_code
,
200
)
...
...
@@ -193,6 +194,7 @@ class UsersApiTests(TestCase):
self
.
assertEqual
(
response
.
data
[
'username'
],
local_username
)
self
.
assertEqual
(
response
.
data
[
'first_name'
],
self
.
test_first_name
)
self
.
assertEqual
(
response
.
data
[
'last_name'
],
self
.
test_last_name
)
self
.
assertIsNotNone
(
response
.
data
[
'created'
])
def
test_user_list_post_inactive
(
self
):
test_uri
=
'/api/users'
...
...
@@ -264,6 +266,7 @@ class UsersApiTests(TestCase):
self
.
assertEqual
(
response
.
data
[
'last_name'
],
self
.
test_last_name
)
self
.
assertEqual
(
response
.
data
[
'full_name'
],
'{} {}'
.
format
(
self
.
test_first_name
,
self
.
test_last_name
))
self
.
assertEqual
(
response
.
data
[
'is_active'
],
False
)
self
.
assertIsNotNone
(
response
.
data
[
'created'
])
def
test_user_detail_post_duplicate_username
(
self
):
"""
...
...
lms/djangoapps/api_manager/users/views.py
View file @
df7e1ab9
...
...
@@ -71,6 +71,7 @@ def _serialize_user(response_data, user):
response_data
[
'last_name'
]
=
user
.
last_name
response_data
[
'id'
]
=
user
.
id
response_data
[
'is_active'
]
=
user
.
is_active
response_data
[
'created'
]
=
user
.
date_joined
return
response_data
...
...
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