From 86d88ab336ba42e37cffc6a8ef74ad07a010bb8c Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Sun, 30 Jun 2019 05:37:47 +0000
Subject: [PATCH] Merged r18322 from trunk to 4.0-stable (#31552).

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18324 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/common/_calendar.html.erb | 1 +
 app/views/gantts/show.html.erb      | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/app/views/common/_calendar.html.erb b/app/views/common/_calendar.html.erb
index 852ab5235..5d76b7415 100644
--- a/app/views/common/_calendar.html.erb
+++ b/app/views/common/_calendar.html.erb
@@ -1,4 +1,5 @@
 <%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%>
+<%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>
 <table class="cal">
 <thead>
 <tr><th scope="col" title="<%= l(:label_week) %>" class="week-number"></th><% 7.times do |i| %><th scope="col"><%= day_name( (calendar.first_wday+i)%7 ) %></th><% end %></tr>
diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb
index 4206598cd..563928ebc 100644
--- a/app/views/gantts/show.html.erb
+++ b/app/views/gantts/show.html.erb
@@ -153,6 +153,7 @@
     <%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %>
     <%= content_tag(:div, :class => "gantt_subjects") do %>
       <%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%>
+        <%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>
         <%= @gantt.subjects.html_safe %>
       <% end %>
     <% end %>
@@ -307,6 +308,7 @@
 <% end %>
 
 <%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%>
+  <%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>
   <%= @gantt.lines.html_safe %>
 <% end %>