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

Merge pull request #18659 from edx/ai/EDUCATOR-2588-moderator

Browse Source 
Fix forums threads load issue in the user view.
This commit is contained in:
Attiya Ishaque
2018-07-31 21:03:31 +05:00
committed by GitHub
parent 077b9f1a61 6ada0ca76d
commit 6e878bf263
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/djangoapps/discussion/static/discussion/js/discussion_board_factory.js
View File

@@ -32,6 +32,9 @@
routerEvents;
// TODO: eliminate usage of global variables when possible
if (options.roles === undefined) {
options.roles = {};
}
DiscussionUtil.loadRoles(options.roles);
window.$$course_id = options.courseId;
window.courseName = options.courseName;

3
lms/djangoapps/discussion/static/discussion/js/discussion_profile_page_factory.js
View File

@@ -33,6 +33,9 @@
'Community TA': []
});
if (options.roles === undefined) {
options.roles = {};
}
DiscussionUtil.loadRoles(options.roles);
window.$$course_id = options.courseId;
window.courseName = options.courseName;

7
lms/djangoapps/discussion/static/discussion/js/spec/discussion_profile_page_factory_spec.js
View File

@@ -17,7 +17,7 @@ define(
DiscussionProfilePageFactory(_.extend(
{
courseId: testCourseId,
roles: DiscussionSpecHelper.getTestRoleInfo(),
roles: (options) ? options.roles : DiscussionSpecHelper.getTestRoleInfo(),
courseSettings: DiscussionSpecHelper.createTestCourseSettings().attributes,
el: $('.discussion-user-threads'),
discussion: new Discussion(),
@@ -40,6 +40,11 @@ define(
initializeDiscussionProfilePageFactory();
expect($('.discussion-user-threads').text()).toContain('Show');
});
it('can render itself when roles are undefined', function() {
var options = {roles: undefined};
initializeDiscussionProfilePageFactory(options);
expect($('.discussion-user-threads').text()).toContain('Show');
});
});
}
);