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
0bd39386
Commit
0bd39386
authored
Sep 24, 2014
by
Zia Fazal
Committed by
Jonathan Piacenti
Aug 20, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ziafazal/api-add-company-logo-to-organization-model: added logo_url field
parent
5535f68b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
3 deletions
+7
-3
lms/djangoapps/api_manager/migrations/0013_auto__add_field_organization_logo_url.py
+0
-0
lms/djangoapps/api_manager/models.py
+1
-0
lms/djangoapps/api_manager/organizations/serializers.py
+3
-3
lms/djangoapps/api_manager/organizations/tests.py
+3
-0
No files found.
lms/djangoapps/api_manager/migrations/0013_auto__add_field_organization_logo_url.py
0 → 100644
View file @
0bd39386
This diff is collapsed.
Click to expand it.
lms/djangoapps/api_manager/models.py
View file @
0bd39386
...
...
@@ -144,6 +144,7 @@ class Organization(TimeStampedModel):
contact_name
=
models
.
CharField
(
max_length
=
255
,
null
=
True
,
blank
=
True
)
contact_email
=
models
.
EmailField
(
max_length
=
255
,
null
=
True
,
blank
=
True
)
contact_phone
=
models
.
CharField
(
max_length
=
50
,
null
=
True
,
blank
=
True
)
logo_url
=
models
.
CharField
(
max_length
=
255
,
blank
=
True
,
null
=
True
)
workgroups
=
models
.
ManyToManyField
(
Workgroup
,
related_name
=
"organizations"
)
users
=
models
.
ManyToManyField
(
User
,
related_name
=
"organizations"
)
groups
=
models
.
ManyToManyField
(
Group
,
related_name
=
"organizations"
)
...
...
lms/djangoapps/api_manager/organizations/serializers.py
View file @
0bd39386
...
...
@@ -13,8 +13,8 @@ class OrganizationSerializer(serializers.ModelSerializer):
class
Meta
:
""" Serializer/field specification """
model
=
Organization
fields
=
(
'url'
,
'id'
,
'name'
,
'display_name'
,
'contact_name'
,
'contact_email'
,
'contact_phone'
,
'workgroups'
,
'users'
,
'groups'
,
'created'
,
'modified'
)
fields
=
(
'url'
,
'id'
,
'name'
,
'display_name'
,
'contact_name'
,
'contact_email'
,
'contact_phone'
,
'logo_url'
,
'workgroups'
,
'users'
,
'groups'
,
'created'
,
'modified'
)
read_only
=
(
'url'
,
'id'
,
'created'
)
...
...
@@ -25,5 +25,5 @@ class BasicOrganizationSerializer(serializers.ModelSerializer):
class
Meta
:
""" Serializer/field specification """
model
=
Organization
fields
=
(
'url'
,
'id'
,
'name'
,
'created'
,
'display_name'
)
fields
=
(
'url'
,
'id'
,
'name'
,
'created'
,
'display_name'
,
'logo_url'
)
read_only
=
(
'url'
,
'id'
,
'created'
,)
lms/djangoapps/api_manager/organizations/tests.py
View file @
0bd39386
...
...
@@ -48,6 +48,7 @@ class OrganizationsApiTests(ModuleStoreTestCase):
self
.
test_organization_contact_name
=
'John Org'
self
.
test_organization_contact_email
=
'john@test.org'
self
.
test_organization_contact_phone
=
'+1 332 232 24234'
self
.
test_organization_logo_url
=
'org_logo.jpg'
self
.
test_user_email
=
str
(
uuid
.
uuid4
())
self
.
test_user_username
=
str
(
uuid
.
uuid4
())
...
...
@@ -117,6 +118,7 @@ class OrganizationsApiTests(ModuleStoreTestCase):
'contact_name'
:
self
.
test_organization_contact_name
,
'contact_email'
:
self
.
test_organization_contact_email
,
'contact_phone'
:
self
.
test_organization_contact_phone
,
'logo_url'
:
self
.
test_organization_logo_url
,
'users'
:
users
}
response
=
self
.
do_post
(
self
.
base_organizations_uri
,
data
)
...
...
@@ -134,6 +136,7 @@ class OrganizationsApiTests(ModuleStoreTestCase):
self
.
assertEqual
(
response
.
data
[
'contact_name'
],
self
.
test_organization_contact_name
)
self
.
assertEqual
(
response
.
data
[
'contact_email'
],
self
.
test_organization_contact_email
)
self
.
assertEqual
(
response
.
data
[
'contact_phone'
],
self
.
test_organization_contact_phone
)
self
.
assertEqual
(
response
.
data
[
'logo_url'
],
self
.
test_organization_logo_url
)
self
.
assertIsNotNone
(
response
.
data
[
'workgroups'
])
self
.
assertEqual
(
len
(
response
.
data
[
'users'
]),
len
(
users
))
self
.
assertIsNotNone
(
response
.
data
[
'created'
])
...
...
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