summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2018-02-18 12:25:26 +0000
committerGo MAEDA <maeda@farend.jp>2018-02-18 12:25:26 +0000
commit9448923f0b9f2927cf22b166373820114e272dcc (patch)
tree390cdd9631fcde81e814de5cdeb723e9537fddfe
parent0037cef83dc13d51633a7457cf5898db496c282c (diff)
downloadredmine-9448923f0b9f2927cf22b166373820114e272dcc.tar.gz
redmine-9448923f0b9f2927cf22b166373820114e272dcc.zip
Merged r17204 from trunk to 3.4-stable (#28168).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17205 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>