From 59dbf689606c35b6e32c565a56a6f616359c4e7e Mon Sep 17 00:00:00 2001 From: Vlad Bokov Date: Mon, 14 Apr 2014 20:45:40 +0700 Subject: Display diagnostics in text format for xhr request --- .../middleware/templates/rescues/diagnostics.erb | 16 ---------------- .../middleware/templates/rescues/diagnostics.html.erb | 16 ++++++++++++++++ .../middleware/templates/rescues/diagnostics.text.erb | 9 +++++++++ 3 files changed, 25 insertions(+), 16 deletions(-) delete mode 100644 actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb create mode 100644 actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.html.erb create mode 100644 actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.text.erb (limited to 'actionpack/lib/action_dispatch') diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb deleted file mode 100644 index f154021ae6..0000000000 --- a/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb +++ /dev/null @@ -1,16 +0,0 @@ -
-

- <%= @exception.class.to_s %> - <% if @request.parameters['controller'] %> - in <%= @request.parameters['controller'].camelize %>Controller<% if @request.parameters['action'] %>#<%= @request.parameters['action'] %><% end %> - <% end %> -

-
- -
-

<%= h @exception.message %>

- - <%= render template: "rescues/_source" %> - <%= render template: "rescues/_trace" %> - <%= render template: "rescues/_request_and_response" %> -
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.html.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.html.erb new file mode 100644 index 0000000000..f154021ae6 --- /dev/null +++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.html.erb @@ -0,0 +1,16 @@ +
+

+ <%= @exception.class.to_s %> + <% if @request.parameters['controller'] %> + in <%= @request.parameters['controller'].camelize %>Controller<% if @request.parameters['action'] %>#<%= @request.parameters['action'] %><% end %> + <% end %> +

+
+ +
+

<%= h @exception.message %>

+ + <%= render template: "rescues/_source" %> + <%= render template: "rescues/_trace" %> + <%= render template: "rescues/_request_and_response" %> +
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.text.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.text.erb new file mode 100644 index 0000000000..603de54b8b --- /dev/null +++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.text.erb @@ -0,0 +1,9 @@ +<%= @exception.class.to_s %><% + if @request.parameters['controller'] +%> in <%= @request.parameters['controller'].camelize %>Controller<% if @request.parameters['action'] %>#<%= @request.parameters['action'] %><% end %> +<% end %> + +<%= @exception.message %> +<%= render template: "rescues/_source" %> +<%= render template: "rescues/_trace" %> +<%= render template: "rescues/_request_and_response" %> -- cgit v1.2.3