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

pass in an asset_string to user_content on faculty journal page; fixes #3993 

I don't think objects or embeds will work on this page, but this will at least
make the page load.

Change-Id: I3c2062709885748010416340b6b8a1263b67f6c6
Reviewed-on: https://gerrit.instructure.com/2566
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
This commit is contained in:
Zach Wily 2011-03-09 07:11:13 -07:00
parent 37e9a261ba
commit ea548f0df3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/user_notes/_user_note.html.erb
View File

@ -28,7 +28,7 @@
</div>
<div class="content">
<div class="inner_content user_content formatted_note">
<%= user_content(user_note.try_rescue(:formatted_note) || nbsp, user_note.try(:user).try(:asset_string), nil) %>
<%= user_content(user_note.try_rescue(:formatted_note) || nbsp, user_note.try(:user).try(:asset_string), user_note.try(:user).try(:asset_string)) %>
</div>
</div>
</div>