Skip to content
Snippets Groups Projects
Commit 3bb34faa authored by Awais Jibran's avatar Awais Jibran
Browse files

Fix edge checklist 500 error 

EDUCATOR-3355
parent 71161b8e
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 593 additions and 90 deletions
cms/djangoapps/contentstore/api/tests/test_quality.py
+ 1
− 0
View file @ 3bb34faa
......@@ -125,6 +125,7 @@ class CourseQualityViewTest(SharedModuleStoreTestCase, APITestCase):
'total_visible': 1,
'total_number': 1,
'highlights_enabled': False,
'highlights_active_for_course': False,
},
'subsections': {
'num_with_one_block_type': 1,
......
cms/djangoapps/contentstore/api/tests/test_validation.py
+ 1
− 1
View file @ 3bb34faa
......@@ -92,6 +92,7 @@ class CourseValidationViewTest(SharedModuleStoreTestCase, APITestCase):
'has_update': True,
},
'certificates': {
'is_enabled': True,
'is_activated': False,
'has_certificate': False,
},
......@@ -101,5 +102,4 @@ class CourseValidationViewTest(SharedModuleStoreTestCase, APITestCase):
},
'is_self_paced': True,
}
self.assertDictEqual(resp.data, expected_data)
cms/djangoapps/contentstore/api/views/course_quality.py
+ 4
− 2
View file @ 3bb34faa
......@@ -5,6 +5,7 @@ from scipy import stats
from rest_framework.generics import GenericAPIView
from rest_framework.response import Response
from contentstore.views.item import highlights_setting
from edxval.api import get_videos_for_course
from openedx.core.djangoapps.request_cache.middleware import request_cached
from openedx.core.lib.api.view_utils import DeveloperErrorViewMixin, view_auth_classes
......@@ -122,12 +123,13 @@ class CourseQualityView(DeveloperErrorViewMixin, GenericAPIView):
def _sections_quality(self, course):
sections, visible_sections = self._get_sections(course)
sections_with_highlights = [s for s in visible_sections if s.highlights]
sections_with_highlights = [section for section in visible_sections if section.highlights]
return dict(
total_number=len(sections),
total_visible=len(visible_sections),
number_with_highlights=len(sections_with_highlights),
highlights_enabled=course.highlights_enabled_for_messaging,
highlights_active_for_course=course.highlights_enabled_for_messaging,
highlights_enabled=highlights_setting.is_enabled(),
)
def _subsections_quality(self, course, request):
......
cms/djangoapps/contentstore/api/views/course_validation.py
+ 3
− 1
View file @ 3bb34faa
......@@ -205,9 +205,11 @@ class CourseValidationView(DeveloperErrorViewMixin, GenericAPIView):
def _certificates_validation(self, course):
is_activated, certificates = CertificateManager.is_activated(course)
certificates_enabled = certificates is not None
return dict(
is_activated=is_activated,
has_certificate=len(certificates) > 0,
has_certificate=certificates_enabled and len(certificates) > 0,
is_enabled=certificates_enabled,
)
def _updates_validation(self, course, request):
......
cms/templates/checklists.html
+ 13
− 7
View file @ 3bb34faa
......@@ -2,11 +2,13 @@
<%inherit file="base.html" />
<%def name="online_help_token()"><% return "files" %></%def>
<%!
from cms.djangoapps.contentstore import utils
from cms.djangoapps.contentstore.config.waffle_utils import should_show_checklists_quality
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import HTML, Text
from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json
from util.course import has_certificates_enabled
%>
<%block name="title">${_("Checklists")}</%block>
<%block name="bodyclass">is-signedin course view-checklists</%block>
......@@ -34,8 +36,12 @@
<div class="wrapper-content wrapper">
<div class="content">
<%static:studiofrontend entry="courseHealthCheck">
<%
course_key = context_course.id
<%
course_key = unicode(context_course.id)
certificates_url = ''
if has_certificates_enabled(context_course):
certificates_url = utils.reverse_course_url('certificates_list_handler', course_key)
%>
{
"lang": "${language_code | n, js_escaped_string}",
......@@ -54,11 +60,11 @@
},
"enable_quality": ${should_show_checklists_quality(context_course.id) | n, dump_js_escaped_json},
"links": {
"certificates": ${reverse('certificates_list_handler', kwargs={'course_key_string': unicode(course_key)})| n, dump_js_escaped_json},
"course_outline": ${reverse('course_handler', kwargs={'course_key_string': unicode(course_key)})| n, dump_js_escaped_json},
"course_updates": ${reverse('course_info_handler', kwargs={'course_key_string': unicode(course_key)})| n, dump_js_escaped_json},
"grading_policy": ${reverse('grading_handler', kwargs={'course_key_string': unicode(course_key)})| n, dump_js_escaped_json},
"settings": ${reverse('settings_handler', kwargs={'course_key_string': unicode(course_key)})| n, dump_js_escaped_json}
"certificates": ${certificates_url | n, dump_js_escaped_json},
"course_outline": ${utils.reverse_course_url('course_handler', course_key) | n, dump_js_escaped_json},
"course_updates": ${utils.reverse_course_url('course_info_handler', course_key) | n, dump_js_escaped_json},
"grading_policy": ${utils.reverse_course_url('grading_handler', course_key) | n, dump_js_escaped_json},
"settings": ${utils.reverse_course_url('settings_handler', course_key) | n, dump_js_escaped_json}
}
}
</%static:studiofrontend>
......
common/djangoapps/util/course.py
+ 11
− 0
View file @ 3bb34faa
......@@ -57,3 +57,14 @@ def get_link_for_about_page(course):
)
return course_about_url
def has_certificates_enabled(course):
"""
Arguments:
course: This can be either a course overview object or a course descriptor.
Returns a boolean if the course has enabled certificates
"""
if not settings.FEATURES.get('CERTIFICATES_HTML_VIEW', False):
return False
return course.cert_html_view_enabled
package-lock.json
+ 559
− 78
View file @ 3bb34faa
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment