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

feat: added user messages and backed now uses discussion_enabled flag (#31716)

Browse Source 
* refactor: simplified tasks.py for discussions

* fix: do not create a topic for the unpublished unit

* feat: added user messages and backed now uses discussion_enabled flag

* fix: update default for discussion_enabled flag

* feat: removed redundant tests and fixes
This commit is contained in:
Ahtisham Shahid
2023-02-22 12:41:02 +05:00
committed by GitHub
parent 7f90b5d3e1
commit 33dc8e1f21
5 changed files with 121 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cms/static/js/spec/views/pages/course_outline_spec.js
View File

@@ -2422,26 +2422,6 @@ describe('CourseOutlinePage', function() {
expect($('.modal-section .edit-discussion')).not.toExist();
});
it('shows discussion settings if unit level discussions are enabled', function() {
getUnitStatus({}, {unit_level_discussions: true});
outlinePage.$('.outline-unit .configure-button').click();
expect($('.modal-section .edit-discussion')).toExist();
});
it('marks checkbox as disabled', function() {
getUnitStatus({}, {unit_level_discussions: true});
outlinePage.$('.outline-unit .configure-button').click();
var discussionCheckbox = $('#discussion_enabled');
expect(discussionCheckbox).toExist();
expect(discussionCheckbox.is(':checked')).toBeFalsy();
});
it('marks checkbox as enabled', function() {
getUnitStatus({discussion_enabled: true}, {unit_level_discussions: true});
outlinePage.$('.outline-unit .configure-button').click();
expect($('#discussion_enabled').is(':checked')).toBeTruthy();
});
});
verifyTypePublishable('unit', function(options) {

16
cms/static/js/views/modals/course_outline_modals.js
View File

@@ -941,6 +941,7 @@ define(['jquery', 'backbone', 'underscore', 'gettext', 'js/views/baseview',
afterRender: function() {
AbstractEditor.prototype.afterRender.call(this);
this.setStatus(this.currentValue());
this.showTipText();
},
currentValue: function() {
@@ -948,6 +949,21 @@ define(['jquery', 'backbone', 'underscore', 'gettext', 'js/views/baseview',
return discussionEnabled === true || discussionEnabled === 'enabled';
},
showTipText: function() {
if (this.model.get('published')) {
$('.un-published-tip').hide()
} else {
$('.un-published-tip').show()
}
let enabledForGraded = course.get('discussions_settings').enable_graded_units
if (this.model.get('graded') && !enabledForGraded) {
$('#discussion_enabled').prop('disabled', true);
$('.graded-tip').show()
} else {
$('.graded-tip').hide()
}
},
setStatus: function(value) {
this.$('#discussion_enabled').prop('checked', value);
},