From dbcbbcf2bc58e8971672b143d1c52c0244e33f26 Mon Sep 17 00:00:00 2001
From: Byron Bischoff <byronb@gmail.com>
Date: Thu, 23 Oct 2014 09:53:43 -0700
Subject: =?UTF-8?q?Show=20the=20user=E2=80=99s=20application=20in=20the=20?=
 =?UTF-8?q?source=20window=20and=20select=20the=20correct=20trace=20list,?=
 =?UTF-8?q?=20closes=20#17312?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 actionpack/lib/action_dispatch/middleware/templates/rescues/_source.erb | 2 +-
 .../lib/action_dispatch/middleware/templates/rescues/_trace.html.erb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_dispatch/middleware/templates')

diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/_source.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/_source.erb
index ba29e26930..eabac3a9d2 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/_source.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/_source.erb
@@ -1,7 +1,7 @@
 <% if @source_extract %>
   <% @source_extract.each_with_index do |extract_source, index| %>
     <% if extract_source[:code] %>
-      <div class="source <%="hidden" if index != 0%>" id="frame-source-<%=index%>">
+      <div class="source <%="hidden" if @show_source_idx != index%>" id="frame-source-<%=index%>">
         <div class="info">
           Extracted source (around line <strong>#<%= extract_source[:line_number] %></strong>):
         </div>
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb
index f62caf51d7..ab57b11c7d 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb
@@ -12,7 +12,7 @@
   <% end %>
 
   <% @traces.each do |name, trace| %>
-    <div id="<%= name.gsub(/\s/, '-') %>" style="display: <%= (name == "Application Trace") ? 'block' : 'none' %>;">
+    <div id="<%= name.gsub(/\s/, '-') %>" style="display: <%= (name == @trace_to_show) ? 'block' : 'none' %>;">
       <pre><code><% trace.each do |frame| %><a class="trace-frames" data-frame-id="<%= frame[:id] %>" href="#"><%= frame[:trace] %></a><br><% end %></code></pre>
     </div>
   <% end %>
-- 
cgit v1.2.3