From 18073c971e69fcfbfcafc8f2ec81768ea18220f8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 29 Oct 2016 14:06:15 +0000
Subject: Don't use a global variable for storing context menu URL.

git-svn-id: http://svn.redmine.org/redmine/trunk@15936 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_list.html.erb        | 2 +-
 app/views/issues/_list_simple.html.erb | 2 +-
 app/views/issues/_relations.html.erb   | 4 ++--
 app/views/issues/index.html.erb        | 2 +-
 app/views/issues/show.html.erb         | 4 +++-
 5 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'app/views/issues')

diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 2376a845b..851fca1a3 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -1,4 +1,4 @@
-<%= form_tag({}) do -%>
+<%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%>
 <%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>
 <div class="autoscroll">
 <table class="list issues <%= sort_css_classes %>">
diff --git a/app/views/issues/_list_simple.html.erb b/app/views/issues/_list_simple.html.erb
index 8ce273db6..0d2850cd0 100644
--- a/app/views/issues/_list_simple.html.erb
+++ b/app/views/issues/_list_simple.html.erb
@@ -1,5 +1,5 @@
 <% if issues && issues.any? %>
-<%= form_tag({}) do %>
+<%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do %>
   <table class="list list-simple issues">
     <thead><tr>
     <th class="id">#</th>
diff --git a/app/views/issues/_relations.html.erb b/app/views/issues/_relations.html.erb
index dcf079564..cab1d0c1a 100644
--- a/app/views/issues/_relations.html.erb
+++ b/app/views/issues/_relations.html.erb
@@ -7,7 +7,7 @@
 <p><strong><%=l(:label_related_issues)%></strong></p>
 
 <% if @relations.present? %>
-<form>
+<%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do %>
 <table class="list issues">
 <% @relations.each do |relation| %>
   <% other_issue = relation.other_issue(@issue) -%>
@@ -30,7 +30,7 @@
   </tr>
 <% end %>
 </table>
-</form>
+<% end %>
 <% end %>
 
 <%= form_for @relation, {
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index d0fd943f0..a9f321c3d 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -69,4 +69,4 @@
                                 :title => l(:label_changes_details)) %>
 <% end %>
 
-<%= context_menu issues_context_menu_path %>
+<%= context_menu %>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index f8849052d..b9e5111fa 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -96,7 +96,9 @@ end %>
   <%= link_to_new_subtask(@issue) if User.current.allowed_to?(:manage_subtasks, @project) %>
 </div>
 <p><strong><%=l(:label_subtask_plural)%></strong></p>
+<%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do %>
 <%= render_descendants_tree(@issue) unless @issue.leaf? %>
+<% end %>
 </div>
 <% end %>
 
@@ -157,4 +159,4 @@ end %>
     <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
 <% end %>
 
-<%= context_menu issues_context_menu_path %>
+<%= context_menu %>
-- 
cgit v1.2.3