Merged r3869 from trunk.

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

diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml
index e8d67ce416e9486fede537065f9edf9b861fd26d..858f3b2e6477c50c32c1ca1ca72105af18caf26b 100644 (file)
--- 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] %></li>
+                                             :selected => (@issue && p == @issue.priority), :disabled => (!@can[:edit] || !@issue.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] %></li>
+                                                 :selected => (@issue && p == @issue.done_ratio), :disabled => (!@can[:edit] || !@issue.leaf?) %></li>
                <% end -%>
                </ul>
        </li>