diff --git a/cms/djangoapps/contentstore/management/commands/tests/test_fix_not_found.py b/cms/djangoapps/contentstore/management/commands/tests/test_fix_not_found.py new file mode 100644 index 0000000000..bd519a4167 --- /dev/null +++ b/cms/djangoapps/contentstore/management/commands/tests/test_fix_not_found.py @@ -0,0 +1,47 @@ +""" +Tests for the fix_not_found management command +""" + +from django.core.management import call_command +from xmodule.modulestore import ModuleStoreEnum +from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase +from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory + + +class TestFixNotFound(ModuleStoreTestCase): + """ + Tests for the fix_not_found management command + """ + def test_fix_not_found_non_split(self): + """ + The management command doesn't work on non split courses + """ + course = CourseFactory(default_store=ModuleStoreEnum.Type.mongo) + with self.assertRaises(SystemExit): + call_command("fix_not_found", unicode(course.id)) + + def test_fix_not_found(self): + course = CourseFactory.create(default_store=ModuleStoreEnum.Type.split) + ItemFactory.create(category='chapter', parent_location=course.location) + + # get course again in order to update its children list + course = self.store.get_course(course.id) + + # create a dangling usage key that we'll add to the course's children list + dangling_pointer = course.id.make_usage_key('chapter', 'DanglingPointer') + + course.children.append(dangling_pointer) + self.store.update_item(course, self.user.id) + + # the course block should now point to two children, one of which + # doesn't actually exist + self.assertEqual(len(course.children), 2) + self.assertIn(dangling_pointer, course.children) + + call_command("fix_not_found", unicode(course.id)) + + # make sure the dangling pointer was removed from + # the course block's children + course = self.store.get_course(course.id) + self.assertEqual(len(course.children), 1) + self.assertNotIn(dangling_pointer, course.children) diff --git a/cms/static/js/certificates/models/signatory.js b/cms/static/js/certificates/models/signatory.js index ba478d5ece..416607d222 100644 --- a/cms/static/js/certificates/models/signatory.js +++ b/cms/static/js/certificates/models/signatory.js @@ -46,8 +46,8 @@ function(_, str, Backbone, BackboneRelational, gettext) { 'title': gettext('Signatory title should span over maximum of 2 lines.') }, errors); } - else if ((lines.length > 1 && (lines[0].length > 40 || lines[1].length > 40)) || - (lines.length === 1 && title.length > 40)) { + else if ((lines.length > 1 && (lines[0].length > 53 && lines[1].length > 53)) || + (lines.length === 1 && title.length > 106)) { errors = _.extend({ 'title': gettext('Signatory title should have maximum of 40 characters per line.') }, errors); diff --git a/cms/static/js/certificates/spec/views/certificate_details_spec.js b/cms/static/js/certificates/spec/views/certificate_details_spec.js index 75c3f84d51..b4044182fa 100644 --- a/cms/static/js/certificates/spec/views/certificate_details_spec.js +++ b/cms/static/js/certificates/spec/views/certificate_details_spec.js @@ -246,7 +246,7 @@ function(_, Course, CertificatesCollection, CertificateModel, CertificateDetails }); setValuesToInputs(this.view, { - inputSignatoryTitle: 'New Signatory Test Title longer than 40 characters in length' + inputSignatoryTitle: 'This is a certificate signatory title that has waaaaaaay more than 106 characters, in order to cause an exception.' }); setValuesToInputs(this.view, { diff --git a/cms/static/js/certificates/spec/views/certificate_editor_spec.js b/cms/static/js/certificates/spec/views/certificate_editor_spec.js index af3681d2de..5ccd3794f2 100644 --- a/cms/static/js/certificates/spec/views/certificate_editor_spec.js +++ b/cms/static/js/certificates/spec/views/certificate_editor_spec.js @@ -228,7 +228,7 @@ function(_, Course, CertificateModel, SignatoryModel, CertificatesCollection, Ce } ); - it('signatories should not save when title has more than 40 characters per line', function() { + it('signatories should not save when fields have too many characters per line', function() { this.view.$(SELECTORS.addSignatoryButton).click(); setValuesToInputs(this.view, { inputCertificateName: 'New Certificate Name' @@ -239,7 +239,7 @@ function(_, Course, CertificateModel, SignatoryModel, CertificatesCollection, Ce }); setValuesToInputs(this.view, { - inputSignatoryTitle: 'New Signatory title longer than 40 characters on one line' + inputSignatoryTitle: 'This is a certificate signatory title that has waaaaaaay more than 106 characters, in order to cause an exception.' }); setValuesToInputs(this.view, { diff --git a/cms/static/js/spec/views/pages/container_spec.js b/cms/static/js/spec/views/pages/container_spec.js index cb738ac959..c9eb7c270d 100644 --- a/cms/static/js/spec/views/pages/container_spec.js +++ b/cms/static/js/spec/views/pages/container_spec.js @@ -574,6 +574,25 @@ define(["jquery", "underscore", "underscore.string", "common/js/spec_helpers/aja }); }); + it('also works for older-style add component links', function () { + // Some third party xblocks (problem-builder in particular) expect add + // event handlers on custom add buttons which is what the platform + // used to use instead of - + diff --git a/common/djangoapps/course_modes/models.py b/common/djangoapps/course_modes/models.py index db6ff974f3..d76823e9bb 100644 --- a/common/djangoapps/course_modes/models.py +++ b/common/djangoapps/course_modes/models.py @@ -100,6 +100,9 @@ class CourseMode(models.Model): # Modes that allow a student to pursue a verified certificate VERIFIED_MODES = [VERIFIED, PROFESSIONAL] + # Modes that allow a student to pursue a non-verified certificate + NON_VERIFIED_MODES = [HONOR, AUDIT, NO_ID_PROFESSIONAL_MODE] + # Modes that allow a student to earn credit with a university partner CREDIT_MODES = [CREDIT_MODE] diff --git a/common/djangoapps/student/tests/test_certificates.py b/common/djangoapps/student/tests/test_certificates.py index 539dc456b9..af4a6db8f1 100644 --- a/common/djangoapps/student/tests/test_certificates.py +++ b/common/djangoapps/student/tests/test_certificates.py @@ -13,6 +13,7 @@ from xmodule.modulestore.tests.factories import CourseFactory from student.tests.factories import UserFactory, CourseEnrollmentFactory from certificates.tests.factories import GeneratedCertificateFactory # pylint: disable=import-error from certificates.api import get_certificate_url # pylint: disable=import-error +from course_modes.models import CourseMode # pylint: disable=no-member @@ -42,6 +43,15 @@ class CertificateDisplayTest(ModuleStoreTestCase): self._create_certificate(enrollment_mode) self._check_can_download_certificate() + @patch.dict('django.conf.settings.FEATURES', {'CERTIFICATES_HTML_VIEW': False}) + def test_display_verified_certificate_no_id(self): + """ + Confirm that if we get a certificate with a no-id-professional mode + we still can download our certificate + """ + self._create_certificate(CourseMode.NO_ID_PROFESSIONAL_MODE) + self._check_can_download_certificate_no_id() + @ddt.data('verified', 'honor') @override_settings(CERT_NAME_SHORT='Test_Certificate') @patch.dict('django.conf.settings.FEATURES', {'CERTIFICATES_HTML_VIEW': True}) @@ -105,6 +115,16 @@ class CertificateDisplayTest(ModuleStoreTestCase): self.assertContains(response, u'Download Your ID Verified') self.assertContains(response, self.DOWNLOAD_URL) + def _check_can_download_certificate_no_id(self): + """ + Inspects the dashboard to see if a certificate for a non verified course enrollment + is present + """ + response = self.client.get(reverse('dashboard')) + self.assertContains(response, u'Download') + self.assertContains(response, u'(PDF)') + self.assertContains(response, self.DOWNLOAD_URL) + def _check_can_not_download_certificate(self): """ Make sure response does not have any of the download certificate buttons diff --git a/common/lib/xmodule/xmodule/discussion_module.py b/common/lib/xmodule/xmodule/discussion_module.py index 89bd27a9c7..8c134991bd 100644 --- a/common/lib/xmodule/xmodule/discussion_module.py +++ b/common/lib/xmodule/xmodule/discussion_module.py @@ -97,13 +97,10 @@ class DiscussionModule(DiscussionFields, XModule): def get_course(self): """ - Return the CourseDescriptor at the root of the tree we're in. + Return CourseDescriptor by course id. """ - block = self - while block.parent: - block = block.get_parent() - - return block + course = self.runtime.modulestore.get_course(self.course_id) + return course class DiscussionDescriptor(DiscussionFields, MetadataOnlyEditingDescriptor, RawDescriptor): diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py index 95cf99e00c..379f5f04ba 100644 --- a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py +++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py @@ -312,7 +312,7 @@ class SplitBulkWriteMixin(BulkOperationsMixin): if bulk_write_record.active: bulk_write_record.index = updated_index_entry else: - self.db_connection.update_course_index(updated_index_entry, course_key) + self.db_connection.update_course_index(updated_index_entry, course_context=course_key) def get_structure(self, course_key, version_guid): bulk_write_record = self._get_bulk_ops_record(course_key) diff --git a/common/static/common/js/components/collections/paging_collection.js b/common/static/common/js/components/collections/paging_collection.js index 4bf4ff3066..a8af909897 100644 --- a/common/static/common/js/components/collections/paging_collection.js +++ b/common/static/common/js/components/collections/paging_collection.js @@ -90,16 +90,20 @@ */ setPage: function (page) { var oldPage = this.currentPage, - self = this; - return this.goTo(page - (this.isZeroIndexed ? 1 : 0), {reset: true}).then( + self = this, + deferred = $.Deferred(); + this.goTo(page - (this.isZeroIndexed ? 1 : 0), {reset: true}).then( function () { self.isStale = false; self.trigger('page_changed'); + deferred.resolve(); }, function () { self.currentPage = oldPage; + deferred.fail(); } ); + return deferred.promise(); }, diff --git a/common/static/common/templates/components/search-field.underscore b/common/static/common/templates/components/search-field.underscore index aac29f640d..c25d8640f6 100644 --- a/common/static/common/templates/components/search-field.underscore +++ b/common/static/common/templates/components/search-field.underscore @@ -1,7 +1,7 @@
- +
diff --git a/lms/djangoapps/teams/tests/test_views.py b/lms/djangoapps/teams/tests/test_views.py index cdca9ee676..f1610a6d99 100644 --- a/lms/djangoapps/teams/tests/test_views.py +++ b/lms/djangoapps/teams/tests/test_views.py @@ -5,6 +5,9 @@ import pytz from datetime import datetime from dateutil import parser import ddt +from elasticsearch.exceptions import ConnectionError +from mock import patch +from search.search_engine_base import SearchEngine from django.core.urlresolvers import reverse from django.conf import settings @@ -1397,3 +1400,49 @@ class TestDeleteMembershipAPI(EventTestMixin, TeamAPITestCase): def test_missing_membership(self): self.delete_membership(self.wind_team.team_id, self.users['student_enrolled'].username, 404) + + +class TestElasticSearchErrors(TeamAPITestCase): + """Test that the Team API is robust to Elasticsearch connection errors.""" + + ES_ERROR = ConnectionError('N/A', 'connection error', {}) + + @patch.object(SearchEngine, 'get_search_engine', side_effect=ES_ERROR) + def test_list_teams(self, __): + """Test that text searches return a 503 when Elasticsearch is down. + + The endpoint should still return 200 when a search is not supplied.""" + self.get_teams_list( + expected_status=503, + data={'course_id': self.test_course_1.id, 'text_search': 'zoinks'}, + user='staff' + ) + self.get_teams_list( + expected_status=200, + data={'course_id': self.test_course_1.id}, + user='staff' + ) + + @patch.object(SearchEngine, 'get_search_engine', side_effect=ES_ERROR) + def test_create_team(self, __): + """Test that team creation is robust to Elasticsearch errors.""" + self.post_create_team( + expected_status=200, + data=self.build_team_data(name='zoinks'), + user='staff' + ) + + @patch.object(SearchEngine, 'get_search_engine', side_effect=ES_ERROR) + def test_delete_team(self, __): + """Test that team deletion is robust to Elasticsearch errors.""" + self.delete_team(self.wind_team.team_id, 204, user='staff') + + @patch.object(SearchEngine, 'get_search_engine', side_effect=ES_ERROR) + def test_patch_team(self, __): + """Test that team updates are robust to Elasticsearch errors.""" + self.patch_team_detail( + self.wind_team.team_id, + 200, + data={'description': 'new description'}, + user='staff' + ) diff --git a/lms/djangoapps/teams/views.py b/lms/djangoapps/teams/views.py index eea9e58400..07f477fb6c 100644 --- a/lms/djangoapps/teams/views.py +++ b/lms/djangoapps/teams/views.py @@ -58,7 +58,7 @@ from .serializers import ( add_team_count ) from .search_indexes import CourseTeamIndexer -from .errors import AlreadyOnTeamInCourse, NotEnrolledInCourseForTeam +from .errors import AlreadyOnTeamInCourse, ElasticSearchConnectionError, NotEnrolledInCourseForTeam TEAM_MEMBERSHIPS_PER_PAGE = 2 TOPICS_PER_PAGE = 12 @@ -293,6 +293,9 @@ class TeamsListView(ExpandableFieldViewMixin, GenericAPIView): example, the course_id may not reference a real course or the page number may be beyond the last page. + If the server is unable to connect to Elasticsearch, and + the text_search parameter is supplied, a 503 error is returned. + **Response Values for POST** Any logged in user who has verified their email address can create @@ -366,7 +369,14 @@ class TeamsListView(ExpandableFieldViewMixin, GenericAPIView): return Response(error, status=status.HTTP_400_BAD_REQUEST) result_filter.update({'topic_id': topic_id}) if text_search and CourseTeamIndexer.search_is_enabled(): - search_engine = CourseTeamIndexer.engine() + try: + search_engine = CourseTeamIndexer.engine() + except ElasticSearchConnectionError: + return Response( + build_api_error(ugettext_noop('Error connecting to elasticsearch')), + status=status.HTTP_503_SERVICE_UNAVAILABLE + ) + result_filter.update({'course_id': course_id_string}) search_results = search_engine.search( diff --git a/lms/static/js/components/tabbed/views/tabbed_view.js b/lms/static/js/components/tabbed/views/tabbed_view.js index e0de186cc5..70d4afe43c 100644 --- a/lms/static/js/components/tabbed/views/tabbed_view.js +++ b/lms/static/js/components/tabbed/views/tabbed_view.js @@ -4,11 +4,37 @@ 'underscore', 'jquery', 'text!templates/components/tabbed/tabbed_view.underscore', - 'text!templates/components/tabbed/tab.underscore'], - function (Backbone, _, $, tabbedViewTemplate, tabTemplate) { + 'text!templates/components/tabbed/tab.underscore', + 'text!templates/components/tabbed/tabpanel.underscore', + ], function ( + Backbone, + _, + $, + tabbedViewTemplate, + tabTemplate, + tabPanelTemplate + ) { + var getTabPanelId = function (id) { + return 'tabpanel-' + id; + }; + + var TabPanelView = Backbone.View.extend({ + template: _.template(tabPanelTemplate), + initialize: function (options) { + this.url = options.url; + this.view = options.view; + }, + render: function () { + var tabPanelHtml = this.template({tabId: getTabPanelId(this.url)}); + this.setElement($(tabPanelHtml)); + this.$el.append(this.view.render().el); + return this; + } + }); + var TabbedView = Backbone.View.extend({ events: { - 'click .nav-item[role="tab"]': 'switchTab' + 'click .nav-item.tab': 'switchTab' }, template: _.template(tabbedViewTemplate), @@ -31,6 +57,10 @@ initialize: function (options) { this.router = options.router || null; this.tabs = options.tabs; + // Convert each view into a TabPanelView + _.each(this.tabs, function (tabInfo) { + tabInfo.view = new TabPanelView({url: tabInfo.url, view: tabInfo.view}); + }, this); this.urlMap = _.reduce(this.tabs, function (map, value) { map[value.url] = value; return map; @@ -42,12 +72,17 @@ this.$el.html(this.template({})); _.each(this.tabs, function(tabInfo, index) { var tabEl = $(_.template(tabTemplate, { - index: index, - title: tabInfo.title, - url: tabInfo.url - })); + index: index, + title: tabInfo.title, + url: tabInfo.url, + tabPanelId: getTabPanelId(tabInfo.url) + })), + tabContainerEl = this.$('.tabs'); self.$('.page-content-nav').append(tabEl); - }); + + // Render and append the current tab panel + tabContainerEl.append(tabInfo.view.render().$el); + }, this); // Re-display the default (first) tab if the // current route does not belong to one of the // tabs. Otherwise continue displaying the tab @@ -63,10 +98,16 @@ tab = tabMeta.tab, tabEl = tabMeta.element, view = tab.view; - this.$('a.is-active').removeClass('is-active').attr('aria-selected', 'false'); - tabEl.addClass('is-active').attr('aria-selected', 'true'); - view.setElement(this.$('.page-content-main')).render(); - this.$('.sr-is-focusable.sr-tab').focus(); + // Hide old tab/tabpanel + this.$('button.is-active').removeClass('is-active').attr('aria-expanded', 'false'); + this.$('.tabpanel[aria-expanded="true"]').attr('aria-expanded', 'false').addClass('is-hidden'); + // Show new tab/tabpanel + tabEl.addClass('is-active').attr('aria-expanded', 'true'); + view.$el.attr('aria-expanded', 'true').removeClass('is-hidden'); + // This bizarre workaround makes focus work in Chrome. + _.defer(function () { + view.$('.sr-is-focusable.' + getTabPanelId(tab.url)).focus(); + }); if (this.router) { this.router.navigate(tab.url, {replace: true}); } @@ -85,10 +126,10 @@ var tab, element; if (typeof tabNameOrIndex === 'string') { tab = this.urlMap[tabNameOrIndex]; - element = this.$('a[data-url='+tabNameOrIndex+']'); + element = this.$('button[data-url='+tabNameOrIndex+']'); } else { tab = this.tabs[tabNameOrIndex]; - element = this.$('a[data-index='+tabNameOrIndex+']'); + element = this.$('button[data-index='+tabNameOrIndex+']'); } return {'tab': tab, 'element': element}; } diff --git a/lms/static/js/spec/components/tabbed/tabbed_view_spec.js b/lms/static/js/spec/components/tabbed/tabbed_view_spec.js index 7c46819f42..cebe44f6d6 100644 --- a/lms/static/js/spec/components/tabbed/tabbed_view_spec.js +++ b/lms/static/js/spec/components/tabbed/tabbed_view_spec.js @@ -15,20 +15,40 @@ render: function () { this.$el.text(this.text); + return this; } - }); + }), + activeTab = function () { + return view.$('.page-content-nav'); + }, + activeTabPanel = function () { + return view.$('.tabpanel[aria-expanded="true"]'); + }; describe('TabbedView component', function () { beforeEach(function () { view = new TabbedView({ tabs: [{ title: 'Test 1', - view: new TestSubview({text: 'this is test text'}) + view: new TestSubview({text: 'this is test text'}), + url: 'test-1' }, { title: 'Test 2', - view: new TestSubview({text: 'other text'}) + view: new TestSubview({text: 'other text'}), + url: 'test-2' }] }).render(); + + // _.defer() is used to make calls to + // jQuery.focus() work in Chrome. _.defer() + // delays the execution of a function until the + // current call stack is clear. That behavior + // will cause tests to fail, so we'll instead + // make _.defer() immediately invoke its + // argument. + spyOn(_, 'defer').andCallFake(function (func) { + func(); + }); }); it('can render itself', function () { @@ -36,33 +56,33 @@ }); it('shows its first tab by default', function () { - expect(view.$el.text()).toContain('this is test text'); - expect(view.$el.text()).not.toContain('other text'); + expect(activeTabPanel().text()).toContain('this is test text'); + expect(activeTabPanel().text()).not.toContain('other text'); }); it('displays titles for each tab', function () { - expect(view.$el.text()).toContain('Test 1'); - expect(view.$el.text()).toContain('Test 2'); + expect(activeTab().text()).toContain('Test 1'); + expect(activeTab().text()).toContain('Test 2'); }); it('can switch tabs', function () { view.$('.nav-item[data-index=1]').click(); - expect(view.$el.text()).not.toContain('this is test text'); - expect(view.$el.text()).toContain('other text'); + expect(activeTabPanel().text()).not.toContain('this is test text'); + expect(activeTabPanel().text()).toContain('other text'); }); it('marks the active tab as selected using aria attributes', function () { - expect(view.$('.nav-item[data-index=0]')).toHaveAttr('aria-selected', 'true'); - expect(view.$('.nav-item[data-index=1]')).toHaveAttr('aria-selected', 'false'); + expect(view.$('.nav-item[data-index=0]')).toHaveAttr('aria-expanded', 'true'); + expect(view.$('.nav-item[data-index=1]')).toHaveAttr('aria-expanded', 'false'); view.$('.nav-item[data-index=1]').click(); - expect(view.$('.nav-item[data-index=0]')).toHaveAttr('aria-selected', 'false'); - expect(view.$('.nav-item[data-index=1]')).toHaveAttr('aria-selected', 'true'); + expect(view.$('.nav-item[data-index=0]')).toHaveAttr('aria-expanded', 'false'); + expect(view.$('.nav-item[data-index=1]')).toHaveAttr('aria-expanded', 'true'); }); it('sets focus for screen readers', function () { spyOn($.fn, 'focus'); - view.$('.nav-item[data-index=1]').click(); - expect(view.$('.sr-is-focusable.sr-tab').focus).toHaveBeenCalled(); + view.$('.nav-item[data-url="test-2"]').click(); + expect(view.$('.sr-is-focusable.test-2').focus).toHaveBeenCalled(); }); describe('history', function() { diff --git a/lms/static/sass/_developer.scss b/lms/static/sass/_developer.scss index ac6f48daf1..4fdeaaf317 100644 --- a/lms/static/sass/_developer.scss +++ b/lms/static/sass/_developer.scss @@ -275,6 +275,14 @@ } } + .members-info { + margin: 0; + padding: 0; + li { + display: inline; + } + } + .edit-members { @extend %ui-no-list; @@ -341,3 +349,23 @@ } } +//efischer - TNL-3189 +//copied from cms/static/sass/elements/_system-feedback.scss#L106 +//along with some "hide the inherited value, we want none" action +.prompt.warning button { + @extend %btn-no-style; + box-shadow: none; + text-shadow: none; + + &:hover { + color: $orange-s2; + background: transparent; + box-shadow: none; + } + + &:focus { + box-shadow: none; + border: 0px; + } +} + diff --git a/lms/static/sass/views/_teams.scss b/lms/static/sass/views/_teams.scss index e2546a59e0..688535cf0f 100644 --- a/lms/static/sass/views/_teams.scss +++ b/lms/static/sass/views/_teams.scss @@ -22,9 +22,12 @@ %button-reset { box-shadow: none; border: none; + border-radius: 0; background-image: none; background-color: transparent; - font-weight: normal; + font-family: inherit; + font-size: inherit; + font-weight: inherit; } // layout @@ -148,6 +151,7 @@ border-bottom: 3px solid $gray-l5; .nav-item { + @extend %button-reset; display: inline-block; margin-bottom: -3px; // to match the border border-bottom: 3px solid $gray-l5; @@ -175,7 +179,7 @@ .listing-tools { @extend %t-copy-sub1; margin: ($baseline/10) $baseline; - color: $gray-l1; + color: $gray-d1; label { // override color: inherit; @@ -719,11 +723,11 @@ .u-field.error { input, textarea { - border-color: $error-red; + border-color: $danger-red; } .u-field-message-help, .u-field-description-message { - color: $error-red !important; + color: $danger-red !important; } } @@ -748,5 +752,3 @@ .create-team.form-actions { margin-top: $baseline; } - - diff --git a/lms/templates/components/tabbed/tab.underscore b/lms/templates/components/tabbed/tab.underscore index 19936e3b32..d7c5e37c7e 100644 --- a/lms/templates/components/tabbed/tab.underscore +++ b/lms/templates/components/tabbed/tab.underscore @@ -1 +1 @@ -<%= title %> + diff --git a/lms/templates/components/tabbed/tabbed_view.underscore b/lms/templates/components/tabbed/tabbed_view.underscore index 80a39c2655..669fa98421 100644 --- a/lms/templates/components/tabbed/tabbed_view.underscore +++ b/lms/templates/components/tabbed/tabbed_view.underscore @@ -1,3 +1,4 @@ -
-
+
+
+
diff --git a/lms/templates/components/tabbed/tabpanel.underscore b/lms/templates/components/tabbed/tabpanel.underscore new file mode 100644 index 0000000000..c1104c167e --- /dev/null +++ b/lms/templates/components/tabbed/tabpanel.underscore @@ -0,0 +1,3 @@ + diff --git a/lms/templates/dashboard/_dashboard_certificate_information.html b/lms/templates/dashboard/_dashboard_certificate_information.html index 034fcfde1e..4d75650a81 100644 --- a/lms/templates/dashboard/_dashboard_certificate_information.html +++ b/lms/templates/dashboard/_dashboard_certificate_information.html @@ -59,7 +59,7 @@ else: ${_("View {cert_name_short}").format(cert_name_short=cert_name_short,)} - % elif cert_status['show_download_url'] and (enrollment.mode == 'honor' or enrollment.mode == 'audit'): + % elif cert_status['show_download_url'] and enrollment.mode in CourseMode.NON_VERIFIED_MODES:
  • diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 7c269c356d..9248926a1e 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -48,7 +48,7 @@ git+https://github.com/edx/i18n-tools.git@v0.1.3#egg=i18n-tools==v0.1.3 git+https://github.com/edx/edx-oauth2-provider.git@0.5.6#egg=oauth2-provider==0.5.6 -e git+https://github.com/edx/edx-val.git@v0.0.5#egg=edx-val -e git+https://github.com/pmitros/RecommenderXBlock.git@518234bc354edbfc2651b9e534ddb54f96080779#egg=recommender-xblock --e git+https://github.com/edx/edx-search.git@release-2015-09-04#egg=edx-search +-e git+https://github.com/edx/edx-search.git@release-2015-09-11a#egg=edx-search -e git+https://github.com/edx/edx-milestones.git@9b44a37edc3d63a23823c21a63cdd53ef47a7aa4#egg=edx-milestones git+https://github.com/edx/edx-lint.git@c5745631d2eee4e2efe8c31fa7b42fe2c12a0755#egg=edx_lint==0.2.7 -e git+https://github.com/edx/xblock-utils.git@213a97a50276d6a2504d8133650b2930ead357a0#egg=xblock-utils