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

Merge pull request #15480 from edx/staubina/ed-592

Browse Source 
Staubina/ed 592
This commit is contained in:
Albert (AJ) St. Aubin
2017-07-12 17:24:53 -04:00
committed by GitHub
parent 1f6a4f22d1 b8b0110d15
commit c78b84ca3f
6 changed files with 131 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/static/common/js/discussion/content.js
View File

@@ -122,7 +122,7 @@
userId = this.get('user_id');
if (userId) {
this.set('staff_authored', DiscussionUtil.isStaff(userId));
this.set('community_ta_authored', DiscussionUtil.isTA(userId));
this.set('community_ta_authored', DiscussionUtil.isTA(userId) || DiscussionUtil.isGroupTA(userId));
} else {
this.set('staff_authored', false);
this.set('community_ta_authored', false);

12
common/static/common/js/discussion/utils.js
View File

@@ -1,4 +1,4 @@
/* globals $$course_id, Content, Markdown, MathJax, URI */
/* globals $$course_id, Content, Markdown, MathJax, URI, _ */
(function() {
'use strict';
this.DiscussionUtil = (function() {
@@ -41,6 +41,16 @@
return _.include(ta, parseInt(userId));
};
DiscussionUtil.isGroupTA = function(userId) {
var groupTa,
localUserId = userId;
if (_.isUndefined(userId)) {
localUserId = this.user ? this.user.id : void 0;
}
groupTa = _.union(this.roleIds['Group Moderator']);
return _.include(groupTa, parseInt(localUserId, 10));
};
DiscussionUtil.isPrivilegedUser = function(userId) {
return this.isStaff(userId) || this.isTA(userId);
};

3
common/static/common/js/discussion/views/discussion_content_view.js
View File

@@ -508,7 +508,8 @@
return _.template($('#post-user-display-template').html())({
username: endorsement.username,
user_url: DiscussionUtil.urlFor('user_profile', endorsement.user_id),
is_community_ta: DiscussionUtil.isTA(endorsement.user_id),
is_community_ta: DiscussionUtil.isTA(endorsement.user_id) ||
DiscussionUtil.isGroupTA(endorsement.user_id),
is_staff: DiscussionUtil.isStaff(endorsement.user_id)
});
} else {