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

Revert "upgrade gunicorn 19.0 and make upgrade"

Browse Source 
This reverts commit f6c215ae5b.
This commit is contained in:
Feanil Patel
2018-10-31 15:01:00 -04:00
parent cab11bde68
commit 4e13a1c2dd
12 changed files with 38 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/djangoapps/dashboard/sysadmin.py
View File

@@ -296,14 +296,12 @@ class Users(SysadminDashboardView):
action = request.POST.get('action', '')
track.views.server_track(request, action, {}, page='user_sysdashboard')
host_header = 'HTTP_HOST' if request is not None and 'HTTP_HOST' in request.META else 'SERVER_NAME'
if action == 'download_users':
header = [_('username'), _('email'), ]
data = ([u.username, u.email] for u in
(User.objects.all().iterator()))
return self.return_csv('users_{0}.csv'.format(
request.META[host_header]), header, data)
request.META['SERVER_NAME']), header, data)
elif action == 'repair_eamap':
self.msg = u'<h4>{0}</h4><pre>{1}</pre>{2}'.format(
_('Repair Results'),
@@ -554,8 +552,6 @@ class Staffing(SysadminDashboardView):
track.views.server_track(request, action, {},
page='staffing_sysdashboard')
host_header = 'HTTP_HOST' if request is not None and 'HTTP_HOST' in request.META else 'SERVER_NAME'
if action == 'get_staff_csv':
data = []
roles = [CourseInstructorRole, CourseStaffRole, ]
@@ -570,7 +566,7 @@ class Staffing(SysadminDashboardView):
_('role'), _('username'),
_('email'), _('full_name'), ]
return self.return_csv('staff_{0}.csv'.format(
request.META[host_header]), header, data)
request.META['SERVER_NAME']), header, data)
return self.get(request)

4
lms/djangoapps/instructor_task/api_helper.py
View File

@@ -135,13 +135,11 @@ def _get_xmodule_instance_args(request, task_id):
permit old-style xqueue callbacks directly to the appropriate module in the LMS.
The `task_id` is also passed to the tracking log function.
"""
host_header = 'HTTP_HOST' if request is not None and 'HTTP_HOST' in request.META else 'SERVER_NAME'
request_info = {'username': request.user.username,
'user_id': request.user.id,
'ip': request.META['REMOTE_ADDR'],
'agent': request.META.get('HTTP_USER_AGENT', '').decode('latin1'),
'host': request.META[host_header],
'host': request.META['SERVER_NAME'],
}
xmodule_instance_args = {'xqueue_callback_url_prefix': get_xqueue_callback_url_prefix(request),