ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't sent group announcement notifications to rejected admins 

also include date based logic for funsies

test plan:
* invite a teacher to a course
* decline the enrollment
* have a group in the course and create an announcement
* it shouldn't sent to the rejected teacher

closes #CNVS-35561

Change-Id: I597ca8c641a3cbb38b292818add9a1991572d617
Reviewed-on: https://gerrit.instructure.com/104889
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
This commit is contained in:
James Williams 2017-03-13 11:46:02 -06:00
parent ded046fb51
commit 4aea55f36e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/discussion_topic.rb
View File

@ -922,8 +922,7 @@ class DiscussionTopic < ActiveRecord::Base
def active_participants_include_tas_and_teachers(include_observers=false)
participants = active_participants(include_observers)
if self.context.is_a?(Group) && !self.context.course.nil?
participants += self.context.course.teachers
participants += self.context.course.tas
participants += self.context.course.participating_instructors_by_date
participants = participants.compact.uniq
end
participants