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

fix stream_items_helper for rails 3 

Change-Id: Iaa6ab979df100c5770d09435641142d45f66ae75
Reviewed-on: https://gerrit.instructure.com/30963
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
This commit is contained in:
James Williams 2014-02-27 07:26:14 -07:00
parent 5b08359e73
commit 27ebdd7ecc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/notification_message_creator.rb
View File

@ -227,8 +227,8 @@ class NotificationMessageCreator
def message_options_for(user)
user_asset = asset_filtered_by_user(user)
user_asset_context = user_asset.context(user) rescue user_asset
user_asset_context = %w{ContentMigration Submission WikiPage}.include?(user_asset.class.name) ? user_asset.context(user) : user_asset
message_options = {
:subject => @notification.subject,

2
spec/helpers/stream_items_helper_spec.rb
View File

@ -66,7 +66,7 @@ describe StreamItemsHelper do
# this discussion topic will not be shown since it is a graded discussion with a
# future unlock at date
@group_assignment_discussion = group_assignment_discussion({ :course => @course })
@group_assignment_discussion.update_attribute(:user_id, @teacher.id)
@group_assignment_discussion.update_attribute(:user, @teacher)
assignment = @group_assignment_discussion.assignment
assignment.update_attributes({
:due_at => 30.days.from_now,