Project

General

Profile

Feature #33894 » 33894.patch

vzvu 3k6k, 2020-09-21 09:22

View differences:

app/models/issue.rb
acts_as_activity_provider :scope => preload(:project, :author, :tracker, :status),
:author_key => :author_id
DONE_RATIO_OPTIONS = %w(issue_field issue_status)
DONE_RATIO_OPTIONS = %w(issue_field issue_status issue_field_and_closed_status)
attr_reader :transition_warning
attr_writer :deleted_attachment_ids
......
def done_ratio
if Issue.use_status_for_done_ratio? && status && status.default_done_ratio
status.default_done_ratio
elsif Issue.use_issue_field_and_closed_status_for_done_ratio? && status && status.is_closed?
100
else
read_attribute(:done_ratio)
end
......
Setting.issue_done_ratio == 'issue_field'
end
def self.use_issue_field_and_closed_status_for_done_ratio?
Setting.issue_done_ratio == 'issue_field_and_closed_status'
end
def self.done_ratio_editable?
use_status_for_done_ratio? || use_issue_field_and_closed_status_for_done_ratio?
end
def validate_issue
if due_date && start_date && (start_date_changed? || due_date_changed?) && due_date < start_date
errors.add :due_date, :greater_than_start_date
......
def update_done_ratio_from_issue_status
if Issue.use_status_for_done_ratio? && status && status.default_done_ratio
self.done_ratio = status.default_done_ratio
elsif Issue.use_issue_field_and_closed_status_for_done_ratio? && status && status.is_closed?
self.done_ratio = 100
end
end
app/views/issues/_attributes.html.erb
<p><%= f.hours_field :estimated_hours, :size => 3, :required => @issue.required_attribute?('estimated_hours') %> <%= l(:field_hours) %></p>
<% end %>
<% if @issue.safe_attribute?('done_ratio') && Issue.use_field_for_done_ratio? %>
<% if @issue.safe_attribute?('done_ratio') && Issue.done_ratio_editable? %>
<p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :required => @issue.required_attribute?('done_ratio') %></p>
<% end %>
</div>
app/views/issues/bulk_edit.html.erb
</p>
<% end %>
<% if @safe_attributes.include?('done_ratio') && Issue.use_field_for_done_ratio? %>
<% if @safe_attributes.include?('done_ratio') && Issue.done_ratio_editable? %>
<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]) %>
config/locales/en.yml
setting_issue_done_ratio: Calculate the issue done ratio with
setting_issue_done_ratio_issue_field: Use the issue field
setting_issue_done_ratio_issue_status: Use the issue status
setting_issue_done_ratio_issue_field_and_closed_status: Use the issue field (100% if closed)
setting_start_of_week: Start calendars on
setting_rest_api_enabled: Enable REST web service
setting_cache_formatted_text: Cache formatted text
config/locales/ja.yml
setting_issue_done_ratio: 進捗率の算出方法
setting_issue_done_ratio_issue_field: チケットのフィールドを使用
setting_issue_done_ratio_issue_status: チケットのステータスに連動
setting_issue_done_ratio_issue_field_and_closed_status: チケットのフィールドを使用(終了したチケットは100%)
setting_start_of_week: 週の開始曜日
setting_rest_api_enabled: RESTによるWebサービスを有効にする
setting_default_notification_option: デフォルトのメール通知オプション
test/unit/issue_test.rb
end
end
# done_ratio should change to 100 when the status is closed and Setting.issue_done_ratio equal issue_field_and_closed_status
test "when updating to closed status should update done_ratio according to Setting.issue_done_ratio" do
closed_status = IssueStatus.find(5)
closed_status.update!(:default_done_ratio => 90)
with_settings :issue_done_ratio => 'issue_field' do
issue = Issue.generate!(:status_id => 1, :done_ratio => 30)
issue.update!(:status => closed_status)
assert_equal 30, issue.done_ratio
assert_equal 30, issue.read_attribute(:done_ratio)
end
with_settings :issue_done_ratio => 'issue_status' do
issue = Issue.generate!(:status_id => 1, :done_ratio => 30)
issue.update!(:status => closed_status)
assert_equal 90, issue.done_ratio
assert_equal 90, issue.read_attribute(:done_ratio)
end
with_settings :issue_done_ratio => 'issue_field_and_closed_status' do
issue = Issue.generate!(:status_id => 1, :done_ratio => 30)
issue.update!(:status => closed_status)
assert_equal 100, issue.done_ratio
assert_equal 100, issue.read_attribute(:done_ratio)
end
end
test "done ratio of existing issues follows the new issue_done_ratio setting" do
closed_status = IssueStatus.find(5)
closed_status.update!(:default_done_ratio => 90)
issue = Issue.generate!(:status_id => 1, :done_ratio => 30)
issue.update!(:status => closed_status)
with_settings :issue_done_ratio => 'issue_status' do
assert_equal 90, issue.done_ratio
assert_equal 30, issue.read_attribute(:done_ratio)
end
with_settings :issue_done_ratio => 'issue_field_and_closed_status' do
assert_equal 100, issue.done_ratio
assert_equal 30, issue.read_attribute(:done_ratio)
end
with_settings :issue_done_ratio => 'issue_field' do
assert_equal 30, issue.done_ratio
assert_equal 30, issue.read_attribute(:done_ratio)
end
end
test "#by_tracker" do
User.current = User.find(2)
groups = Issue.by_tracker(Project.find(1))
(1-1/2)