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
c7424dd7
Commit
c7424dd7
authored
Apr 28, 2015
by
Sarina Canelake
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Supply default url for XQA server
parent
1ca4b3b9
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
7 deletions
+7
-7
lms/djangoapps/courseware/views.py
+1
-1
lms/djangoapps/lti_provider/tests/test_views.py
+1
-1
lms/djangoapps/lti_provider/views.py
+1
-1
lms/envs/dev.py
+1
-1
lms/templates/courseware/xqa_interface.html
+2
-2
openedx/core/lib/xblock_utils.py
+1
-1
No files found.
lms/djangoapps/courseware/views.py
View file @
c7424dd7
...
@@ -421,7 +421,7 @@ def _index_bulk_op(request, course_key, chapter, section, position):
...
@@ -421,7 +421,7 @@ def _index_bulk_op(request, course_key, chapter, section, position):
'staff_access'
:
staff_access
,
'staff_access'
:
staff_access
,
'studio_url'
:
studio_url
,
'studio_url'
:
studio_url
,
'masquerade'
:
masquerade
,
'masquerade'
:
masquerade
,
'xqa_server'
:
settings
.
FEATURES
.
get
(
'
USE_XQA_SERVER'
,
'http://xqa:server@content-qa.mitx.mit.edu/xqa'
),
'xqa_server'
:
settings
.
FEATURES
.
get
(
'
XQA_SERVER'
,
"http://your_xqa_server.com"
),
'reverifications'
:
fetch_reverify_banner_info
(
request
,
course_key
),
'reverifications'
:
fetch_reverify_banner_info
(
request
,
course_key
),
}
}
...
...
lms/djangoapps/lti_provider/tests/test_views.py
View file @
c7424dd7
...
@@ -278,7 +278,7 @@ class RenderCoursewareTest(TestCase):
...
@@ -278,7 +278,7 @@ class RenderCoursewareTest(TestCase):
'disable_footer'
:
True
,
'disable_footer'
:
True
,
'disable_tabs'
:
True
,
'disable_tabs'
:
True
,
'staff_access'
:
'StaffAccess'
,
'staff_access'
:
'StaffAccess'
,
'xqa_server'
:
'http://
example.com/xqa
'
,
'xqa_server'
:
'http://
your_xqa_server.com
'
,
}
}
request
=
build_run_request
()
request
=
build_run_request
()
views
.
render_courseware
(
request
,
ALL_PARAMS
.
copy
())
views
.
render_courseware
(
request
,
ALL_PARAMS
.
copy
())
...
...
lms/djangoapps/lti_provider/views.py
View file @
c7424dd7
...
@@ -173,7 +173,7 @@ def render_courseware(request, lti_params):
...
@@ -173,7 +173,7 @@ def render_courseware(request, lti_params):
'disable_footer'
:
True
,
'disable_footer'
:
True
,
'disable_tabs'
:
True
,
'disable_tabs'
:
True
,
'staff_access'
:
staff
,
'staff_access'
:
staff
,
'xqa_server'
:
settings
.
FEATURES
.
get
(
'
USE_XQA_SERVER'
,
'http://example.com/xqa
'
),
'xqa_server'
:
settings
.
FEATURES
.
get
(
'
XQA_SERVER'
,
'http://your_xqa_server.com
'
),
}
}
return
render_to_response
(
'courseware/courseware.html'
,
context
)
return
render_to_response
(
'courseware/courseware.html'
,
context
)
lms/envs/dev.py
View file @
c7424dd7
...
@@ -186,7 +186,7 @@ OPEN_ENDED_GRADING_INTERFACE = {
...
@@ -186,7 +186,7 @@ OPEN_ENDED_GRADING_INTERFACE = {
############################## LMS Migration ##################################
############################## LMS Migration ##################################
FEATURES
[
'ENABLE_LMS_MIGRATION'
]
=
True
FEATURES
[
'ENABLE_LMS_MIGRATION'
]
=
True
FEATURES
[
'ACCESS_REQUIRE_STAFF_FOR_COURSE'
]
=
False
# require that user be in the staff_* group to be able to enroll
FEATURES
[
'ACCESS_REQUIRE_STAFF_FOR_COURSE'
]
=
False
# require that user be in the staff_* group to be able to enroll
FEATURES
[
'
USE_
XQA_SERVER'
]
=
'http://xqa:server@content-qa.edX.mit.edu/xqa'
FEATURES
[
'XQA_SERVER'
]
=
'http://xqa:server@content-qa.edX.mit.edu/xqa'
INSTALLED_APPS
+=
(
'lms_migration'
,)
INSTALLED_APPS
+=
(
'lms_migration'
,)
...
...
lms/templates/courseware/xqa_interface.html
View file @
c7424dd7
...
@@ -51,7 +51,7 @@ function sendlog(element_id, edit_link, staff_context){
...
@@ -51,7 +51,7 @@ function sendlog(element_id, edit_link, staff_context){
$
(
'#'
+
element_id
+
'_xqa_log_data'
).
html
(
result
);
$
(
'#'
+
element_id
+
'_xqa_log_data'
).
html
(
result
);
},
},
error
:
function
()
{
error
:
function
()
{
alert
(
'Error: cannot connect to XQA server. Check the value of the
USE_XQA_SERVER feature
.'
);
alert
(
'Error: cannot connect to XQA server. Check the value of the
XQA_SERVER setting
.'
);
console
.
log
(
'error!'
);
console
.
log
(
'error!'
);
}
}
});
});
...
@@ -78,7 +78,7 @@ function getlog(element_id, staff_context){
...
@@ -78,7 +78,7 @@ function getlog(element_id, staff_context){
$
(
'#'
+
element_id
+
'_xqa_log_data'
).
html
(
result
);
$
(
'#'
+
element_id
+
'_xqa_log_data'
).
html
(
result
);
},
},
error
:
function
()
{
error
:
function
()
{
alert
(
'Error: cannot connect to XQA server. Check the value of the
USE_XQA_SERVER feature
.'
);
alert
(
'Error: cannot connect to XQA server. Check the value of the
XQA_SERVER setting
.'
);
}
}
});
});
...
...
openedx/core/lib/xblock_utils.py
View file @
c7424dd7
...
@@ -299,7 +299,7 @@ def add_staff_markup(user, has_instructor_access, block, view, frag, context):
...
@@ -299,7 +299,7 @@ def add_staff_markup(user, has_instructor_access, block, view, frag, context):
'element_id'
:
block
.
location
.
html_id
()
.
replace
(
'-'
,
'_'
),
'element_id'
:
block
.
location
.
html_id
()
.
replace
(
'-'
,
'_'
),
'edit_link'
:
edit_link
,
'edit_link'
:
edit_link
,
'user'
:
user
,
'user'
:
user
,
'xqa_server'
:
settings
.
FEATURES
.
get
(
'
USE_XQA_SERVER'
,
'http://xqa:server@content-qa.mitx.mit.edu/xqa'
),
'xqa_server'
:
settings
.
FEATURES
.
get
(
'
XQA_SERVER'
,
"http://your_xqa_server.com"
),
'histogram'
:
json
.
dumps
(
histogram
),
'histogram'
:
json
.
dumps
(
histogram
),
'render_histogram'
:
render_histogram
,
'render_histogram'
:
render_histogram
,
'block_content'
:
frag
.
content
,
'block_content'
:
frag
.
content
,
...
...
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