Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
ecommerce
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
ecommerce
Commits
e2ed75c2
Commit
e2ed75c2
authored
Aug 29, 2016
by
Michael Frey
Committed by
GitHub
Aug 29, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #916 from edx/mjfrey/check-null-attr
Check for top level image null
parents
890b9102
72386e07
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ecommerce/extensions/api/v2/views/vouchers.py
+1
-1
ecommerce/extensions/basket/views.py
+1
-1
No files found.
ecommerce/extensions/api/v2/views/vouchers.py
View file @
e2ed75c2
...
@@ -191,7 +191,7 @@ class VoucherViewSet(NonDestroyableModelViewSet):
...
@@ -191,7 +191,7 @@ class VoucherViewSet(NonDestroyableModelViewSet):
'contains_verified'
:
is_verified
,
'contains_verified'
:
is_verified
,
'course_start_date'
:
course_info
[
'start'
],
'course_start_date'
:
course_info
[
'start'
],
'id'
:
course
.
id
,
'id'
:
course
.
id
,
'image_url'
:
course_info
[
'image'
]
.
get
(
'src'
,
''
),
'image_url'
:
course_info
.
get
(
'image'
,
''
)
.
get
(
'src'
,
''
),
'organization'
:
CourseKey
.
from_string
(
course
.
id
)
.
org
,
'organization'
:
CourseKey
.
from_string
(
course
.
id
)
.
org
,
'seat_type'
:
course
.
type
,
'seat_type'
:
course
.
type
,
'stockrecords'
:
serializers
.
StockRecordSerializer
(
stock_record
)
.
data
,
'stockrecords'
:
serializers
.
StockRecordSerializer
(
stock_record
)
.
data
,
...
...
ecommerce/extensions/basket/views.py
View file @
e2ed75c2
...
@@ -108,7 +108,7 @@ class BasketSummaryView(BasketView):
...
@@ -108,7 +108,7 @@ class BasketSummaryView(BasketView):
try
:
try
:
course
=
get_course_info_from_catalog
(
self
.
request
.
site
,
course_key
)
course
=
get_course_info_from_catalog
(
self
.
request
.
site
,
course_key
)
description
=
course
[
'short_description'
]
description
=
course
[
'short_description'
]
image_url
=
course
[
'image'
]
.
get
(
'src'
,
''
),
image_url
=
course
.
get
(
'image'
,
''
)
.
get
(
'src'
,
''
)
short_description
=
description
if
description
else
''
short_description
=
description
if
description
else
''
course_name
=
course
[
'title'
]
course_name
=
course
[
'title'
]
except
(
ConnectionError
,
SlumberBaseException
,
Timeout
):
except
(
ConnectionError
,
SlumberBaseException
,
Timeout
):
...
...
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