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
3bbc7430
Commit
3bbc7430
authored
Nov 21, 2013
by
Александр
Committed by
polesye
Nov 22, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BLD-530: Fix 500 error in transcripts.
parent
835893c2
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
5 deletions
+12
-5
CHANGELOG.rst
+2
-0
cms/djangoapps/contentstore/features/transcripts.feature
+1
-0
cms/djangoapps/contentstore/features/transcripts.py
+1
-0
cms/djangoapps/contentstore/views/component.py
+6
-3
cms/templates/unit.html
+2
-2
No files found.
CHANGELOG.rst
View file @
3bbc7430
...
@@ -5,6 +5,8 @@ These are notable changes in edx-platform. This is a rolling list of changes,
...
@@ -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
in roughly chronological order, most recent first. Add your entries at or near
the top. Include a label indicating the component affected.
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: 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.
Blades: a11y - Videos will alert screenreaders when the video is over.
...
...
cms/djangoapps/contentstore/features/transcripts.feature
View file @
3bbc7430
...
@@ -641,6 +641,7 @@ Feature: Video Component Editor
...
@@ -641,6 +641,7 @@ Feature: Video Component Editor
And
I save changes
And
I save changes
Then
when I view the video it does show the captions
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 edit the component
And
I open tab
"Advanced"
And
I open tab
"Advanced"
...
...
cms/djangoapps/contentstore/features/transcripts.py
View file @
3bbc7430
...
@@ -116,6 +116,7 @@ def i_see_status_message(_step, status):
...
@@ -116,6 +116,7 @@ def i_see_status_message(_step, status):
world
.
wait
(
DELAY
)
world
.
wait
(
DELAY
)
world
.
wait_for_ajax_complete
()
world
.
wait_for_ajax_complete
()
assert
not
world
.
css_visible
(
SELECTORS
[
'error_bar'
])
assert
world
.
css_has_text
(
SELECTORS
[
'status_bar'
],
STATUSES
[
status
.
strip
()])
assert
world
.
css_has_text
(
SELECTORS
[
'status_bar'
],
STATUSES
[
status
.
strip
()])
...
...
cms/djangoapps/contentstore/views/component.py
View file @
3bbc7430
...
@@ -249,9 +249,12 @@ def edit_unit(request, location):
...
@@ -249,9 +249,12 @@ def edit_unit(request, location):
)
)
components
=
[
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
for
component
in
item
.
get_children
()
in
item
.
get_children
()
]
]
...
...
cms/templates/unit.html
View file @
3bbc7430
...
@@ -48,8 +48,8 @@ require(["domReady!", "jquery", "js/models/module_info", "coffee/src/views/unit"
...
@@ -48,8 +48,8 @@ require(["domReady!", "jquery", "js/models/module_info", "coffee/src/views/unit"
<article
class=
"unit-body window"
>
<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>
<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"
>
<ol
class=
"components"
>
% for locator in components:
% for
id,
locator in components:
<li
class=
"component"
data-locator=
"${locator}"
/>
<li
class=
"component"
data-locator=
"${locator}"
data-id=
"${id}"
/>
% endfor
% endfor
<li
class=
"new-component-item adding"
>
<li
class=
"new-component-item adding"
>
<div
class=
"new-component"
>
<div
class=
"new-component"
>
...
...
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