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

resolve view conflicts for blti module items 

test plan:
 * create a blti link on a module
 * click on the link and make sure it works

refs #5892

Change-Id: Iece9fa4eb06479079a0a1e1ac954d484b894ca48
Reviewed-on: https://gerrit.instructure.com/6959
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
This commit is contained in:
Bracken Mosbacker 2011-11-14 08:43:07 -07:00 committed by Brian Palmer
parent 0a626fb8ce
commit c79b7f5866
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/external_tools/tool_show.html.erb
View File

@ -4,7 +4,7 @@
<% end %>
<% add_crumb(@resource_title) unless @assignment %>
<% if @assignment.description.present? %>
<% if @assignment && @assignment.description.present? %>
<div class="description user_content" style="margin: 20px">
<%= user_content(@assignment.description) %>
</div>
@ -35,7 +35,7 @@
<%= iframe("about:blank", :name => 'tool_content', :id => 'tool_content', :width => '100%', :height => '400') %>
<% end %>
<% if @tag %>
<% if @tag.context.is_a?(Assignment) && can_do(@tag.context, @current_user, :grade) || can_do(@tag.context.context, @current_user, :manage_assignments) %>
<% if @tag.context.is_a?(Assignment) && (can_do(@tag.context, @current_user, :grade) || can_do(@tag.context.context, @current_user, :manage_assignments)) %>
<% content_for :right_side do %>
<div class="rs-margin-all">
<%= render :partial => 'assignments/external_grader_sidebar', :locals => { :assignment => @tag.context } %>