Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-ora2
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-ora2
Commits
383db5d1
Commit
383db5d1
authored
Jan 09, 2018
by
Dmitry Viskov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WYSISYG editor for prompts (in studio) - backward compatibility added
parent
e73d74ec
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
openassessment/xblock/studio_mixin.py
+1
-1
openassessment/xblock/submission_mixin.py
+1
-0
openassessment/xblock/test/test_submission.py
+1
-1
No files found.
openassessment/xblock/studio_mixin.py
View file @
383db5d1
...
@@ -229,7 +229,7 @@ class StudioMixin(object):
...
@@ -229,7 +229,7 @@ class StudioMixin(object):
self
.
title
=
data
[
'title'
]
self
.
title
=
data
[
'title'
]
self
.
display_name
=
data
[
'title'
]
self
.
display_name
=
data
[
'title'
]
self
.
prompts
=
data
[
'prompts'
]
self
.
prompts
=
data
[
'prompts'
]
self
.
prompt
_type
=
data
[
'prompt
_type'
]
self
.
prompt
s_type
=
data
[
'prompts
_type'
]
self
.
rubric_criteria
=
data
[
'criteria'
]
self
.
rubric_criteria
=
data
[
'criteria'
]
self
.
rubric_assessments
=
data
[
'assessments'
]
self
.
rubric_assessments
=
data
[
'assessments'
]
self
.
editor_assessments_order
=
data
[
'editor_assessments_order'
]
self
.
editor_assessments_order
=
data
[
'editor_assessments_order'
]
...
...
openassessment/xblock/submission_mixin.py
View file @
383db5d1
...
@@ -498,6 +498,7 @@ class SubmissionMixin(object):
...
@@ -498,6 +498,7 @@ class SubmissionMixin(object):
"xblock_id"
:
self
.
get_xblock_id
(),
"xblock_id"
:
self
.
get_xblock_id
(),
"text_response"
:
self
.
text_response
,
"text_response"
:
self
.
text_response
,
"file_upload_response"
:
self
.
file_upload_response
,
"file_upload_response"
:
self
.
file_upload_response
,
"prompts_type"
:
self
.
prompts_type
,
}
}
# Due dates can default to the distant future, in which case
# Due dates can default to the distant future, in which case
...
...
openassessment/xblock/test/test_submission.py
View file @
383db5d1
...
@@ -125,7 +125,7 @@ class SubmissionTest(XBlockHandlerTestCase):
...
@@ -125,7 +125,7 @@ class SubmissionTest(XBlockHandlerTestCase):
def
test_prompt_line_breaks
(
self
,
xblock
):
def
test_prompt_line_breaks
(
self
,
xblock
):
# Verify that prompts with multiple lines retain line breaks
# Verify that prompts with multiple lines retain line breaks
resp
=
self
.
request
(
xblock
,
'render_submission'
,
json
.
dumps
(
dict
()))
resp
=
self
.
request
(
xblock
,
'render_submission'
,
json
.
dumps
(
dict
()))
expected_prompt
=
u"
Line 1
\n\n
Line 2
\n\n\n
Line 3
"
expected_prompt
=
u"
<p><br />Line 1</p><p>Line 2</p><p>Line 3<br /></p>
"
self
.
assertIn
(
expected_prompt
,
resp
)
self
.
assertIn
(
expected_prompt
,
resp
)
@mock_s3
@mock_s3
...
...
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