diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-09-20 03:58:50 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-09-20 03:58:50 +0000 |
| commit | c48e40af3157ddcda367844fafdad492e06729af (patch) | |
| tree | 386d128ad1b9ca6ef42947f2e985599206054b83 | |
| parent | 47e12f12cc0b6a1f89c0d1d639e0c444e5640276 (diff) | |
| download | redmine-c48e40af3157ddcda367844fafdad492e06729af.tar.gz redmine-c48e40af3157ddcda367844fafdad492e06729af.zip | |
Merged r4059 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4129 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/context_menus_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/context_menus/issues.html.erb | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/controllers/context_menus_controller.rb b/app/controllers/context_menus_controller.rb index e437a18dc..5f4b02ca2 100644 --- a/app/controllers/context_menus_controller.rb +++ b/app/controllers/context_menus_controller.rb @@ -13,8 +13,8 @@ class ContextMenusController < ApplicationController memo & s end end - projects = @issues.collect(&:project).compact.uniq - @project = projects.first if projects.size == 1 + @projects = @issues.collect(&:project).compact.uniq + @project = @projects.first if @projects.size == 1 @can = {:edit => (@project && User.current.allowed_to?(:edit_issues, @project)), :log_time => (@project && User.current.allowed_to?(:log_time, @project)), diff --git a/app/views/context_menus/issues.html.erb b/app/views/context_menus/issues.html.erb index efd8cde0e..94d4e802f 100644 --- a/app/views/context_menus/issues.html.erb +++ b/app/views/context_menus/issues.html.erb @@ -32,6 +32,8 @@ </ul> </li> <% end %> + + <% if @projects.size == 1 %> <li class="folder"> <a href="#" class="submenu"><%= l(:field_priority) %></a> <ul> @@ -41,6 +43,8 @@ <% end -%> </ul> </li> + <% end %> + <% unless @project.nil? || @project.shared_versions.open.empty? -%> <li class="folder"> <a href="#" class="submenu"><%= l(:field_fixed_version) %></a> @@ -80,7 +84,8 @@ </ul> </li> <% end -%> - <% if Issue.use_field_for_done_ratio? %> + + <% if Issue.use_field_for_done_ratio? && @projects.size == 1 %> <li class="folder"> <a href="#" class="submenu"><%= l(:field_done_ratio) %></a> <ul> @@ -91,6 +96,7 @@ </ul> </li> <% end %> + <% if !@issue.nil? %> <% if @can[:log_time] -%> <li><%= context_menu_link l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, |