Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions lms/djangoapps/instructor/tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -3139,12 +3139,13 @@ def test_list_report_downloads(self):
{
"url": "https://1.mock.url",
"link": "<a href=\"https://1.mock.url\">mock_file_name_1</a>",
"name": "mock_file_name_1"
},
{
"preview_url": '/csv-viewer?csvUrl=https://1.mock.url',
"name": "mock_file_name_1",
}, {
"url": "https://2.mock.url",
"link": "<a href=\"https://2.mock.url\">mock_file_name_2</a>",
"name": "mock_file_name_2"
"preview_url": '/csv-viewer?csvUrl=https://2.mock.url',
"name": "mock_file_name_2",
}
]
}
Expand Down
12 changes: 10 additions & 2 deletions lms/djangoapps/instructor/views/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -2395,10 +2395,17 @@ def list_report_downloads(request, course_id):

response_payload = {
'downloads': [
dict(name=name, url=url, link=HTML('<a href="{}">{}</a>').format(HTML(url), Text(name)))
for name, url in report_store.links_for(course_id) if report_name is None or name == report_name
dict(
name=name,
url=url,
preview_url='{}?csvUrl={}'.format(reverse('csv-viewer'), url),
link=HTML('<a href="{}">{}</a>').format(HTML(url), Text(name))
)
for name, url in report_store.links_for(course_id)
if report_name is None or name == report_name
]
}

return JsonResponse(response_payload)


Expand All @@ -2420,6 +2427,7 @@ def list_financial_report_downloads(_request, course_id):
for name, url in report_store.links_for(course_id)
]
}

return JsonResponse(response_payload)


Expand Down
1 change: 1 addition & 0 deletions lms/djangoapps/static_template_view/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
url(r'^press$', views.render, {'template': 'press.html'}, name="press"),
url(r'^media-kit$', views.render, {'template': 'media-kit.html'}, name="media-kit"),
url(r'^copyright$', views.render, {'template': 'copyright.html'}, name="copyright"),
url(r'^csv-viewer$', views.render, {'template': 'csv-viewer.html'}, name="csv-viewer"),

# Press releases
url(r'^press/([_a-zA-Z0-9-]+)$', views.render_press_release, name='press_release'),
Expand Down
7 changes: 7 additions & 0 deletions lms/envs/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -1515,6 +1515,13 @@ def _make_locale_paths(settings):
],
'output_filename': 'css/lms-style-vendor.css',
},
'style-vendor-ag-grid': {
'source_filenames': [
'css/vendor/ag-grid.css',
'css/vendor/ag-theme-fresh.css',
],
'output_filename': 'css/lms-style-vendor-ag-grid.css',
},
'style-vendor-tinymce-content': {
'source_filenames': [
'js/vendor/tinymce/js/tinymce/skins/studio-tmce4/content.min.css'
Expand Down
Loading