diff options
| author | Go MAEDA <maeda@farend.jp> | 2024-05-29 15:06:28 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2024-05-29 15:06:28 +0000 |
| commit | a73eb69648cb8f35dd5519c64a200949de9b18ac (patch) | |
| tree | f0da98409f943a35e639e1005dac479e9bc2718d /app/views | |
| parent | 3acc94914f21b65c3ae98e0e358802b561b53ae3 (diff) | |
| download | redmine-a73eb69648cb8f35dd5519c64a200949de9b18ac.tar.gz redmine-a73eb69648cb8f35dd5519c64a200949de9b18ac.zip | |
Introduce configuration for done ratio options interval (#31756).
Patch by Go MAEDA (@maeda).
git-svn-id: https://svn.redmine.org/redmine/trunk@22849 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/issue_statuses/_form.html.erb | 2 | ||||
| -rw-r--r-- | app/views/issues/_attributes.html.erb | 2 | ||||
| -rw-r--r-- | app/views/issues/bulk_edit.html.erb | 2 | ||||
| -rw-r--r-- | app/views/settings/_issues.html.erb | 2 | ||||
| -rw-r--r-- | app/views/settings/_repositories.html.erb | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/app/views/issue_statuses/_form.html.erb b/app/views/issue_statuses/_form.html.erb index 8f06451c6..c2487b002 100644 --- a/app/views/issue_statuses/_form.html.erb +++ b/app/views/issue_statuses/_form.html.erb @@ -4,7 +4,7 @@ <p><%= f.text_field :name, :required => true %></p> <p><%= f.text_area :description, :rows => 4 %></p> <% if Issue.use_status_for_done_ratio? %> - <p><%= f.select :default_done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :include_blank => true, :label => :field_done_ratio %></p> + <p><%= f.select :default_done_ratio, ((0..100).step(Setting.issue_done_ratio_interval.to_i).to_a.collect {|r| ["#{r} %", r]}), :include_blank => true, :label => :field_done_ratio %></p> <% end %> <p><%= f.check_box :is_closed %></p> diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb index 40b89547a..517b67f95 100644 --- a/app/views/issues/_attributes.html.erb +++ b/app/views/issues/_attributes.html.erb @@ -88,7 +88,7 @@ <% end %> <% if @issue.safe_attribute?('done_ratio') && Issue.use_field_for_done_ratio? %> -<p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :required => @issue.required_attribute?('done_ratio') %></p> +<p><%= f.select :done_ratio, ((0..100).step(Setting.issue_done_ratio_interval.to_i).to_a.collect {|r| ["#{r} %", r]}), :required => @issue.required_attribute?('done_ratio') %></p> <% end %> </div> </div> diff --git a/app/views/issues/bulk_edit.html.erb b/app/views/issues/bulk_edit.html.erb index 4fe457b32..a379305be 100644 --- a/app/views/issues/bulk_edit.html.erb +++ b/app/views/issues/bulk_edit.html.erb @@ -178,7 +178,7 @@ <% if @safe_attributes.include?('done_ratio') && Issue.use_field_for_done_ratio? %> <p> <label for='issue_done_ratio'><%= l(:field_done_ratio) %></label> - <%= select_tag 'issue[done_ratio]', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }, @issue_params[:done_ratio]) %> + <%= select_tag 'issue[done_ratio]', options_for_select([[l(:label_no_change_option), '']] + (0..100).step(Setting.issue_done_ratio_interval.to_i).to_a.collect {|r| ["#{r} %", r]}, @issue_params[:done_ratio]) %> </p> <% end %> </div> diff --git a/app/views/settings/_issues.html.erb b/app/views/settings/_issues.html.erb index 68f9a1d7b..7532d5d0e 100644 --- a/app/views/settings/_issues.html.erb +++ b/app/views/settings/_issues.html.erb @@ -17,6 +17,8 @@ <p><%= setting_select :issue_done_ratio, Issue::DONE_RATIO_OPTIONS.collect {|i| [l("setting_issue_done_ratio_#{i}"), i]} %></p> +<p><%= setting_select :issue_done_ratio_interval, [5, 10].collect {|i| ["#{i} %", i]} %></p> + <p><%= setting_multiselect :non_working_week_days, (1..7).map {|d| [day_name(d), d.to_s]}, :inline => true %></p> <p><%= setting_text_field :issues_export_limit, :size => 6 %></p> diff --git a/app/views/settings/_repositories.html.erb b/app/views/settings/_repositories.html.erb index adac52fc7..f89a27944 100644 --- a/app/views/settings/_repositories.html.erb +++ b/app/views/settings/_repositories.html.erb @@ -114,7 +114,7 @@ <%= select_tag("settings[commit_update_keywords][done_ratio][]", options_for_select( [["", ""]] + - (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }, + (0..100).step(Setting.issue_done_ratio_interval.to_i).to_a.collect {|r| ["#{r} %", r]}, rule['done_ratio']), :id => nil ) %> |