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
f0260757
Commit
f0260757
authored
May 29, 2013
by
cahrens
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup.
parent
d7a1dda9
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
11 deletions
+11
-11
cms/djangoapps/contentstore/features/discussion-editor.py
+4
-3
cms/djangoapps/contentstore/features/html-editor.py
+1
-1
cms/djangoapps/contentstore/features/video-editor.py
+2
-1
cms/static/coffee/spec/views/metadata_edit_spec.coffee
+1
-1
cms/static/coffee/src/views/module_edit.coffee
+0
-1
common/lib/xmodule/xmodule/peer_grading_module.py
+3
-3
common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml
+0
-1
No files found.
cms/djangoapps/contentstore/features/discussion-editor.py
View file @
f0260757
...
...
@@ -5,15 +5,16 @@ from lettuce import world, step
@step
(
'I have created a Discussion Tag$'
)
def
i_created_
blank_common_problem
(
step
):
def
i_created_
discussion_tag
(
step
):
world
.
create_component_instance
(
step
,
'.large-discussion-icon'
,
'i4x://edx/templates/discussion/Discussion_Tag'
,
step
,
'.large-discussion-icon'
,
'i4x://edx/templates/discussion/Discussion_Tag'
,
'.xmodule_DiscussionModule'
)
@step
(
'I see three alphabetized settings and their expected values$'
)
def
i_see_only_the_
display_name
(
step
):
def
i_see_only_the_
settings_and_values
(
step
):
world
.
verify_all_setting_entries
(
[
[
'Category'
,
"Week 1"
,
True
],
...
...
cms/djangoapps/contentstore/features/html-editor.py
View file @
f0260757
...
...
@@ -5,7 +5,7 @@ from lettuce import world, step
@step
(
'I have created a Blank HTML Page$'
)
def
i_created_blank_
common_problem
(
step
):
def
i_created_blank_
html_page
(
step
):
world
.
create_component_instance
(
step
,
'.large-html-icon'
,
'i4x://edx/templates/html/Blank_HTML_Page'
,
'.xmodule_HtmlModule'
...
...
cms/djangoapps/contentstore/features/video-editor.py
View file @
f0260757
...
...
@@ -7,7 +7,8 @@ from lettuce import world, step
@step
(
'I have created a Video component$'
)
def
i_created_a_video_component
(
step
):
world
.
create_component_instance
(
step
,
'.large-video-icon'
,
'i4x://edx/templates/video/default'
,
step
,
'.large-video-icon'
,
'i4x://edx/templates/video/default'
,
'.xmodule_VideoModule'
)
...
...
cms/static/coffee/spec/views/metadata_edit_spec.coffee
View file @
f0260757
...
...
@@ -142,7 +142,7 @@ describe "CMS.Views.Metadata.Editor creates editors for each field", ->
})
# Tests for individual views.
assertInputType
=
(
view
,
expectedType
)
->
assertInputType
=
(
view
,
expectedType
)
->
input
=
view
.
$el
.
find
(
'.setting-input'
)
expect
(
input
.
length
).
toBe
(
1
)
expect
(
input
[
0
].
type
).
toBe
(
expectedType
)
...
...
cms/static/coffee/src/views/module_edit.coffee
View file @
f0260757
...
...
@@ -126,7 +126,6 @@ class CMS.Views.ModuleEdit extends Backbone.View
hideDataEditor
:
=>
editorModeButtonParent
=
@
$el
.
find
(
'#editor-mode'
)
# Can it be enough to just remove active-mode?
editorModeButtonParent
.
addClass
(
'inactive-mode'
)
editorModeButtonParent
.
removeClass
(
'active-mode'
)
@
$el
.
find
(
'.wrapper-comp-settings'
).
addClass
(
'is-active'
)
...
...
common/lib/xmodule/xmodule/peer_grading_module.py
View file @
f0260757
...
...
@@ -311,14 +311,14 @@ class PeerGradingModule(PeerGradingFields, XModule):
try
:
response
=
self
.
peer_gs
.
save_grade
(
location
,
grader_id
,
submission_id
,
score
,
feedback
,
submission_key
,
rubric_scores
,
submission_flagged
)
score
,
feedback
,
submission_key
,
rubric_scores
,
submission_flagged
)
return
response
except
GradingServiceError
:
#This is a dev_facing_error
log
.
exception
(
"""Error saving grade to open ended grading service. server url: {0}, location: {1}, submission_id:{2},
submission_key: {3}, score: {4}"""
.
format
(
self
.
peer_gs
.
url
,
location
,
submission_id
,
submission_key
,
score
)
location
,
submission_id
,
submission_key
,
score
)
)
#This is a student_facing_error
return
{
...
...
@@ -449,7 +449,7 @@ class PeerGradingModule(PeerGradingFields, XModule):
try
:
response
=
self
.
peer_gs
.
save_calibration_essay
(
location
,
grader_id
,
calibration_essay_id
,
submission_key
,
score
,
feedback
,
rubric_scores
)
submission_key
,
score
,
feedback
,
rubric_scores
)
if
'actual_rubric'
in
response
:
rubric_renderer
=
combined_open_ended_rubric
.
CombinedOpenEndedRubric
(
self
.
system
,
True
)
response
[
'actual_rubric'
]
=
rubric_renderer
.
render_rubric
(
response
[
'actual_rubric'
])[
'html'
]
...
...
common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml
View file @
f0260757
...
...
@@ -34,5 +34,4 @@ data: |
</task>
</combinedopenended>
children
:
[]
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