diff --git a/app/messages/assignment_unmuted.email.erb b/app/messages/assignment_unmuted.email.erb deleted file mode 100644 index 5e9b98c3e46..00000000000 --- a/app/messages/assignment_unmuted.email.erb +++ /dev/null @@ -1,15 +0,0 @@ -<% define_content :link do %> - <%= polymorphic_url([asset.context, asset]) %> -<% end %> - -<% define_content :subject do %> - <%= t :subject, "Assignment Unmuted: %{title}, %{course}", :title => asset.title, :course => asset.context.name %> -<% end %> - -<%= t :body, <<-BODY, :title => asset.title, :course => asset.context.name, :url => content(:link) -Your instructor has released grade changes and new comments for %{title}. These changes are now viewable. - -You can view it here: -%{url} -BODY -%> diff --git a/app/messages/assignment_unmuted.email.html.erb b/app/messages/assignment_unmuted.email.html.erb deleted file mode 100644 index eb00a1ad303..00000000000 --- a/app/messages/assignment_unmuted.email.html.erb +++ /dev/null @@ -1,15 +0,0 @@ -<% define_content :link do %> - <%= polymorphic_url([asset.context, asset]) %> -<% end %> - -<% define_content :subject do %> - <%= t :subject, "Assignment Unmuted: %{title}, %{course}", :title => asset.title, :course => asset.context.name %> -<% end %> - -<% define_content :footer_link do %> - - <%= t :link, "You can view it here" %> - -<% end %> - -
<%= t :body, "Your instructor has released grade changes and new comments for %{title}. These changes are now viewable.", :title => asset.title %>
diff --git a/app/messages/assignment_unmuted.sms.erb b/app/messages/assignment_unmuted.sms.erb deleted file mode 100644 index b7e529fb5e7..00000000000 --- a/app/messages/assignment_unmuted.sms.erb +++ /dev/null @@ -1,6 +0,0 @@ -<%= t :body, <<-BODY, :title => asset.title, :course => asset.context.name, :website => HostUrl.context_host(asset.context) -Your instructor has released grades and comments for %{title}, %{course}. - -More info at %{website} -BODY -%> diff --git a/app/messages/assignment_unmuted.summary.erb b/app/messages/assignment_unmuted.summary.erb deleted file mode 100644 index 1c4c874fd84..00000000000 --- a/app/messages/assignment_unmuted.summary.erb +++ /dev/null @@ -1,7 +0,0 @@ -<% define_content :link do %> - <%= polymorphic_url([asset.context, asset]) %> -<% end %> - -<% define_content :subject do %> - <%= t :subject, "Grades and comments released for: %{title}, %{course}", :title => asset.title, :course => asset.context.name %> -<% end %> diff --git a/app/messages/notification_types.yml b/app/messages/notification_types.yml index d815606e701..14d0c3580f8 100644 --- a/app/messages/notification_types.yml +++ b/app/messages/notification_types.yml @@ -126,8 +126,6 @@ notifications: - name: Assignment Graded delay_for: <%= 15*60 %> - - name: Assignment Unmuted - delay_for: 0 - name: Submission Graded delay_for: <%= 60*60 %> - name: Submission Grade Changed diff --git a/app/models/assignment.rb b/app/models/assignment.rb index 1bfc94b4c5b..da99859bc6e 100644 --- a/app/models/assignment.rb +++ b/app/models/assignment.rb @@ -1123,16 +1123,6 @@ class Assignment < ActiveRecord::Base assignment.overridden_for(user, skip_clone: true) } - p.dispatch :assignment_unmuted - p.to { |assignment| - BroadcastPolicies::AssignmentParticipants.new(assignment).to - } - p.whenever { |assignment| - BroadcastPolicies::AssignmentPolicy.new(assignment). - should_dispatch_assignment_unmuted? - } - p.data { course_broadcast_data } - p.dispatch :submissions_posted p.to { |assignment| assignment.course.participating_instructors @@ -3391,7 +3381,6 @@ class Assignment < ActiveRecord::Base previously_unposted_submissions.each do |submission| submission.grade_posting_in_progress = true - # Need to broadcast assignment_unmuted here. submission.broadcast_notifications submission.grade_posting_in_progress = false end diff --git a/app/models/broadcast_policies/assignment_policy.rb b/app/models/broadcast_policies/assignment_policy.rb index 7f3ffa7b710..38f906d3e24 100644 --- a/app/models/broadcast_policies/assignment_policy.rb +++ b/app/models/broadcast_policies/assignment_policy.rb @@ -48,13 +48,6 @@ module BroadcastPolicies (assignment.saved_change_to_workflow_state? && assignment.published?) end - def should_dispatch_assignment_unmuted? - # This is handled by individual submissions in the Post Policies era. - return false if assignment.context.post_policies_enabled? - context_sendable? && - assignment.recently_unmuted - end - def should_dispatch_submissions_posted? return false unless assignment.context.post_policies_enabled? context_sendable? && assignment.posting_params_for_notifications.present? diff --git a/app/models/broadcast_policies/submission_policy.rb b/app/models/broadcast_policies/submission_policy.rb index a41d53d1a0a..c256192b6a3 100644 --- a/app/models/broadcast_policies/submission_policy.rb +++ b/app/models/broadcast_policies/submission_policy.rb @@ -73,8 +73,6 @@ module BroadcastPolicies end def should_dispatch_submission_posted? - # When Post Policies aren't enabled, the assignment handles notifications - # via the Assignment Unmuted notification. return false unless assignment.course.post_policies_enabled? && submission.grade_posting_in_progress && context_sendable? diff --git a/app/models/notification.rb b/app/models/notification.rb index 80bfd3ce6ae..55cd4d91fdb 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -487,7 +487,6 @@ EOS Includes: * Assignment/submission grade entered/changed -* Un-muted assignment grade * Grade weight changed EOS when 'Late Grading' diff --git a/lib/mutable.rb b/lib/mutable.rb index e2c0fcdb429..0f6efec89fd 100644 --- a/lib/mutable.rb +++ b/lib/mutable.rb @@ -16,26 +16,6 @@ # with this program. If not, see