Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #576 from MITx/feature/victor/fix-trailing-location-url

Browse Source 
Remove trailing slash from ajax url in ModuleSystem
This commit is contained in:
Calen Pennington
2012-08-28 07:21:47 -07:00
parent 113535dbdf bd2374b6fe
commit 1fe0ccbf25
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/djangoapps/courseware/module_render.py
View File

@@ -198,6 +198,8 @@ def _get_module(user, request, location, student_module_cache, course_id, positi
location=descriptor.location.url(), location=descriptor.location.url(),
dispatch=''), dispatch=''),
) )
# Intended use is as {ajax_url}/{dispatch_command}, so get rid of the trailing slash.
ajax_url = ajax_url.rstrip('/')
# Fully qualified callback URL for external queueing system # Fully qualified callback URL for external queueing system
xqueue_callback_url = '{proto}://{host}'.format( xqueue_callback_url = '{proto}://{host}'.format(
@@ -410,6 +412,10 @@ def modx_dispatch(request, dispatch, location, course_id):
''' '''
# ''' (fix emacs broken parsing) # ''' (fix emacs broken parsing)
# Check parameters and fail fast if there's a problem
if not Location.is_valid(location):
raise Http404("Invalid location")
# Check for submitted files and basic file size checks # Check for submitted files and basic file size checks
p = request.POST.copy() p = request.POST.copy()
if request.FILES: if request.FILES: