Skip to content

Commit 8859232

Browse files
committed
fix: show staff tag for global staff in discussion forum
1 parent 4420dfb commit 8859232

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

lms/djangoapps/discussion/rest_api/serializers.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ def get_context(course, request, thread=None):
8383
course_staff_user_ids = get_course_staff_users_list(course.id)
8484
moderator_user_ids = get_moderator_users_list(course.id)
8585
ta_user_ids = get_course_ta_users_list(course.id)
86+
global_staff_user_ids = list(User.objects.filter(is_staff=True).values_list('id', flat=True))
8687
requester = request.user
8788
cc_requester = CommentClientUser.from_django_user(requester).retrieve(
8889
course_id=course.id
@@ -104,6 +105,7 @@ def get_context(course, request, thread=None):
104105
"moderator_user_ids": moderator_user_ids,
105106
"course_staff_user_ids": course_staff_user_ids,
106107
"ta_user_ids": ta_user_ids,
108+
"global_staff_user_ids": global_staff_user_ids,
107109
"cc_requester": cc_requester,
108110
"has_moderation_privilege": has_moderation_privilege,
109111
"is_global_staff": is_global_staff,
@@ -273,7 +275,7 @@ def _get_user_label(self, user_id):
273275
Returns the role label (i.e. "Staff", "Moderator" or "Community TA") for the user
274276
with the given id.
275277
"""
276-
is_staff = user_id in self.context["course_staff_user_ids"]
278+
is_staff = user_id in self.context["course_staff_user_ids"] or user_id in self.context["global_staff_user_ids"]
277279
is_moderator = user_id in self.context["moderator_user_ids"]
278280
is_ta = user_id in self.context["ta_user_ids"]
279281

0 commit comments

Comments
 (0)