From d26015c62be0b2c4e31a614a5a9e1c5529093e33 Mon Sep 17 00:00:00 2001
From: Enfop <Platte79@gmx.net>
Date: Thu, 23 Jun 2016 05:43:04 +0200
Subject: [PATCH] Return to Agent Events after Event show (#1555)

---
 app/views/events/index.html.erb | 2 +-
 app/views/events/show.html.erb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 50976bdd..4ce666f8 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -32,7 +32,7 @@
             <td class='payload'><%= truncate event.payload.to_json, :length => 90, :omission => "" %></td>
             <td>
               <div class="btn-group btn-group-xs">
-                <%= link_to 'Show', event_path(event), class: "btn btn-default" %>
+                <%= link_to 'Show', event_path(event, return: request.fullpath), class: "btn btn-default" %>
                 <%= link_to 'Re-emit', reemit_event_path(event), method: :post, data: { confirm: 'Are you sure you want to duplicate this event and emit the new one now?' }, class: "btn btn-default" %>
                 <%= link_to 'Delete', event_path(event), method: :delete, data: { confirm: 'Are you sure?' }, class: "btn btn-default" %>
               </div>
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index d7c07f68..c98af0f2 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -49,7 +49,7 @@
 
       <br />
       <div class="btn-group">
-        <%= link_to icon_tag('glyphicon-chevron-left') + ' Back'.html_safe, events_path, class: "btn btn-default" %>
+        <%= link_to icon_tag('glyphicon-chevron-left') + ' Back'.html_safe, filtered_agent_return_link || events_path, class: "btn btn-default" %>
       </div>
     </div>
   </div>