From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 25 Jul 2010 11:56:45 +0000 (+0000)
Subject: Merged r3887 from trunk.
X-Git-Tag: 1.0.1~73
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f682be8468f12acc0ad6cd313cb5805e58c63504;p=redmine.git

Merged r3887 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3888 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml
index 489896e09..d9e92a4f8 100644
--- a/app/views/issues/context_menu.rhtml
+++ b/app/views/issues/context_menu.rhtml
@@ -34,7 +34,7 @@
 		<ul>
 		<% @priorities.each do |p| -%>
 		    <li><%= context_menu_link p.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'priority_id' => p}, :back_url => @back}, :method => :post,
-		                              :selected => (@issue && p == @issue.priority), :disabled => (!@can[:edit] || !@issue.leaf?) %></li>
+		                              :selected => (@issue && p == @issue.priority), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %></li>
 		<% end -%>
 		</ul>
 	</li>
@@ -83,7 +83,7 @@
 		<ul>
 		<% (0..10).map{|x|x*10}.each do |p| -%>
 		    <li><%= context_menu_link "#{p}%", {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'done_ratio' => p}, :back_url => @back}, :method => :post,
-		                                  :selected => (@issue && p == @issue.done_ratio), :disabled => (!@can[:edit] || !@issue.leaf?) %></li>
+		                                  :selected => (@issue && p == @issue.done_ratio), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %></li>
 		<% end -%>
 		</ul>
 	</li>