##// END OF EJS Templates
Do not display items without valid selection in context menu when on different projects. #4998...
Jean-Baptiste Barth -
r3945:a9f5a17c678d
parent child
Show More
@@ -13,8 +13,8 class ContextMenusController < ApplicationController
13 memo & s
13 memo & s
14 end
14 end
15 end
15 end
16 projects = @issues.collect(&:project).compact.uniq
16 @projects = @issues.collect(&:project).compact.uniq
17 @project = projects.first if projects.size == 1
17 @project = @projects.first if @projects.size == 1
18
18
19 @can = {:edit => (@project && User.current.allowed_to?(:edit_issues, @project)),
19 @can = {:edit => (@project && User.current.allowed_to?(:edit_issues, @project)),
20 :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
20 :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
@@ -32,6 +32,8
32 </ul>
32 </ul>
33 </li>
33 </li>
34 <% end %>
34 <% end %>
35
36 <% if @projects.size == 1 %>
35 <li class="folder">
37 <li class="folder">
36 <a href="#" class="submenu"><%= l(:field_priority) %></a>
38 <a href="#" class="submenu"><%= l(:field_priority) %></a>
37 <ul>
39 <ul>
@@ -41,6 +43,8
41 <% end -%>
43 <% end -%>
42 </ul>
44 </ul>
43 </li>
45 </li>
46 <% end %>
47
44 <% unless @project.nil? || @project.shared_versions.open.empty? -%>
48 <% unless @project.nil? || @project.shared_versions.open.empty? -%>
45 <li class="folder">
49 <li class="folder">
46 <a href="#" class="submenu"><%= l(:field_fixed_version) %></a>
50 <a href="#" class="submenu"><%= l(:field_fixed_version) %></a>
@@ -80,7 +84,8
80 </ul>
84 </ul>
81 </li>
85 </li>
82 <% end -%>
86 <% end -%>
83 <% if Issue.use_field_for_done_ratio? %>
87
88 <% if Issue.use_field_for_done_ratio? && @projects.size == 1 %>
84 <li class="folder">
89 <li class="folder">
85 <a href="#" class="submenu"><%= l(:field_done_ratio) %></a>
90 <a href="#" class="submenu"><%= l(:field_done_ratio) %></a>
86 <ul>
91 <ul>
@@ -91,6 +96,7
91 </ul>
96 </ul>
92 </li>
97 </li>
93 <% end %>
98 <% end %>
99
94 <% if !@issue.nil? %>
100 <% if !@issue.nil? %>
95 <% if @can[:log_time] -%>
101 <% if @can[:log_time] -%>
96 <li><%= context_menu_link l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue},
102 <li><%= context_menu_link l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue},
General Comments 0
You need to be logged in to leave comments. Login now