From 86f67f0a38bf79da64524ee261c867a51a3e32ac Mon Sep 17 00:00:00 2001
From: Marius Balteanu <marius.balteanu@zitec.com>
Date: Sat, 13 Sep 2025 09:04:11 +0000
Subject: [PATCH] Merged r23959 from trunk to 6.0-stable (#43192).

git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23977 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/context_menus/issues.html.erb       |  2 +-
 .../context_menus_controller_test.rb          | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/views/context_menus/issues.html.erb b/app/views/context_menus/issues.html.erb
index ee7eaa18c..e30b57626 100644
--- a/app/views/context_menus/issues.html.erb
+++ b/app/views/context_menus/issues.html.erb
@@ -111,7 +111,7 @@
     <a href="#" class="submenu"><%= l(:field_done_ratio) %></a>
     <span class="icon-only"><%= sprite_icon('angle-right', rtl: true) %></span>
     <ul>
-    <% (0..10).map{|x|x*10}.each do |p| -%>
+    <% (0..100).step(Setting.issue_done_ratio_interval.to_i).each do |p| -%>
         <li><%= context_menu_link "#{p}%", _bulk_update_issues_path(@issue, :ids => @issue_ids, :issue => {'done_ratio' => p}, :back_url => @back), :method => :patch,
                                       :selected => (@issue && p == @issue.done_ratio), :disabled => (!@can[:edit] || @issues.any?(&:done_ratio_derived?)) %></li>
     <% end -%>
diff --git a/test/functional/context_menus_controller_test.rb b/test/functional/context_menus_controller_test.rb
index 34d543583..209ff5c8e 100644
--- a/test/functional/context_menus_controller_test.rb
+++ b/test/functional/context_menus_controller_test.rb
@@ -322,6 +322,25 @@ class ContextMenusControllerTest < Redmine::ControllerTest
     assert_select 'a', :text => 'eCookbook - Shared'
   end
 
+  def test_context_menu_should_respect_five_percent_increments
+    with_settings :issue_done_ratio => 'issue_field', :issue_done_ratio_interval => 5 do
+      @request.session[:user_id] = 2
+      get(
+        :issues,
+        :params => {
+          :ids => [1, 2]
+        }
+      )
+      assert_response :success
+
+      assert_select 'a[href*=?]', '/issues/bulk_update?ids%5B%5D=1&ids%5B%5D=2&issue%5Bdone_ratio%5D=0', :text => '0%'
+      assert_select 'a[href*=?]', '/issues/bulk_update?ids%5B%5D=1&ids%5B%5D=2&issue%5Bdone_ratio%5D=5', :text => '5%'
+      assert_select 'a[href*=?]', '/issues/bulk_update?ids%5B%5D=1&ids%5B%5D=2&issue%5Bdone_ratio%5D=10', :text => '10%'
+      assert_select 'a[href*=?]', '/issues/bulk_update?ids%5B%5D=1&ids%5B%5D=2&issue%5Bdone_ratio%5D=55', :text => '55%'
+      assert_select 'a[href*=?]', '/issues/bulk_update?ids%5B%5D=1&ids%5B%5D=2&issue%5Bdone_ratio%5D=100', :text => '100%'
+    end
+  end
+
   def test_context_menu_should_include_add_subtask_link
     @request.session[:user_id] = 2
     get(