removing unneccessary borderless launch template
the tool_show template already had a mechanism for launching a tool full screen. Test Plan: * Borderless launches should still work fixes PLAT-244 Change-Id: Idab2e7f9b61e06c0bfb9e99f0cd70f027b77d147 Reviewed-on: https://gerrit.instructure.com/26728 QA-Review: Nathan Rogowski <nathan@instructure.com> Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Bracken Mosbacker <bracken@instructure.com> Product-Review: Bracken Mosbacker <bracken@instructure.com>
This commit is contained in:
parent
4fdcb9f9b8
commit
4b0345c629
|
@ -111,11 +111,8 @@ class ExternalToolsController < ApplicationController
|
|||
@launch = BasicLTI::ToolLaunch.new(:url => @resource_url, :tool => @tool, :user => @current_user, :context => @context, :link_code => @opaque_id, :return_url => @return_url, :resource_type => @resource_type)
|
||||
@tool_settings = @launch.generate
|
||||
|
||||
if params[:borderless]
|
||||
render :partial => 'external_tools/borderless_launch'
|
||||
else
|
||||
render :template => 'external_tools/tool_show'
|
||||
end
|
||||
@tool_launch_type = 'self'
|
||||
render :template => 'external_tools/tool_show'
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -238,7 +235,8 @@ class ExternalToolsController < ApplicationController
|
|||
@resource_title = launch_settings['tool_name']
|
||||
@tool_settings = launch_settings['tool_settings']
|
||||
|
||||
render :partial => 'external_tools/borderless_launch'
|
||||
@tool_launch_type = 'self'
|
||||
render :template => 'external_tools/tool_show'
|
||||
end
|
||||
|
||||
# @API Get a single external tool
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
<div><% t :redirecting_to_lti, 'Redirecting to LTI app, please wait...' %></div>
|
||||
<form id="tool_form" action="<%= @resource_url %>" method="POST">
|
||||
<% @tool_settings.each do |key, value| %>
|
||||
<%= hidden_field_tag key, value %>
|
||||
<% end %>
|
||||
<button class='btn' type='submit'><%= t :load_tool_button, 'Load %{tool} manually', :tool => @resource_title %></button>
|
||||
</form>
|
||||
|
||||
<script type="text/javascript">
|
||||
window.document.getElementById('tool_form').submit();
|
||||
</script>
|
|
@ -50,7 +50,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<% else %>
|
||||
<button class="btn" type="submit"><%= t :load_tool_button, "Load %{tool}", :tool => @tool.name %></button>
|
||||
<button class="btn" type="submit"><%= t :load_tool_button, "Load %{tool}", :tool => @resource_title %></button>
|
||||
<% end %>
|
||||
</form>
|
||||
<%= iframe("about:blank", :name => 'tool_content', :id => 'tool_content', :width => '100%', :height => '400') %>
|
||||
|
|
Loading…
Reference in New Issue