summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2018-02-18 12:27:18 +0000
committerGo MAEDA <maeda@farend.jp>2018-02-18 12:27:18 +0000
commitb37e19e4158ead9990cb15d26ffb38984bd4a2ce (patch)
treee47f9b2d92c32fbcc8844bb2ca3d6cdb5cd042fa
parent7e39185ec293d6c6f28c67217756e6277fbb371f (diff)
downloadredmine-b37e19e4158ead9990cb15d26ffb38984bd4a2ce.tar.gz
redmine-b37e19e4158ead9990cb15d26ffb38984bd4a2ce.zip
Merged r17204 from trunk to 3.3-stable (#28168).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17206 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/context_menus/issues.html.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/context_menus/issues.html.erb b/app/views/context_menus/issues.html.erb
index c24a7aeca..244f9c54e 100644
--- a/app/views/context_menus/issues.html.erb
+++ b/app/views/context_menus/issues.html.erb
@@ -39,7 +39,7 @@
<ul>
<% @priorities.each do |p| -%>
<li><%= context_menu_link p.name, bulk_update_issues_path(:ids => @issue_ids, :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] || @issues.any?(&:priority_derived?)) %></li>
<% end -%>
</ul>
</li>
@@ -97,7 +97,7 @@
<ul>
<% (0..10).map{|x|x*10}.each do |p| -%>
<li><%= context_menu_link "#{p}%", bulk_update_issues_path(:ids => @issue_ids, :issue => {'done_ratio' => p}, :back_url => @back), :method => :post,
- :selected => (@issue && p == @issue.done_ratio), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %></li>
+ :selected => (@issue && p == @issue.done_ratio), :disabled => (!@can[:edit] || @issues.any?(&:done_ratio_derived?)) %></li>
<% end -%>
</ul>
</li>