Skip to content

Fix 500 error in transcripts. #1739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
polesye merged 1 commit into from
Nov 22, 2013
Merged

Fix 500 error in transcripts. #1739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ These are notable changes in edx-platform. This is a rolling list of changes,
in roughly chronological order, most recent first. Add your entries at or near
the top. Include a label indicating the component affected.

Blades: Fix transcripts 500 error in studio (BLD-530)

Blades: Allow multiple strings as the correct answer to a string response question. BLD-474.

Blades: a11y - Videos will alert screenreaders when the video is over.
Expand Down
1 change: 1 addition & 0 deletions cms/djangoapps/contentstore/features/transcripts.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,7 @@ Feature: Video Component Editor

And I save changes
Then when I view the video it does show the captions
And I see "好 各位同学" text in the captions
And I edit the component

And I open tab "Advanced"
Expand Down
1 change: 1 addition & 0 deletions cms/djangoapps/contentstore/features/transcripts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ def i_see_status_message(_step, status):
world.wait(DELAY)
world.wait_for_ajax_complete()

assert not world.css_visible(SELECTORS['error_bar'])
assert world.css_has_text(SELECTORS['status_bar'], STATUSES[status.strip()])


Expand Down
9 changes: 6 additions & 3 deletions cms/djangoapps/contentstore/views/component.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,12 @@ def edit_unit(request, location):
)

components = [
loc_mapper().translate_location(
course.location.course_id, component.location, False, True
)
[
component.location.url(),
loc_mapper().translate_location(
course.location.course_id, component.location, False, True
)
]
for component
in item.get_children()
]
Expand Down
4 changes: 2 additions & 2 deletions cms/templates/unit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
<article class="unit-body window">
<p class="unit-name-input"><label>${_("Display Name:")}</label><input type="text" value="${unit.display_name_with_default | h}" class="unit-display-name-input" /></p>
<ol class="components">
% for locator in components:
<li class="component" data-locator="${locator}"/>
% for id, locator in components:
<li class="component" data-locator="${locator}" data-id="${id}" />
% endfor
<li class="new-component-item adding">
<div class="new-component">
Expand Down