Implement

Author: fkdkent

app/models/issue.rb

@@ -729,6 +729,8 @@ def workflow_rule_by_attribute(user=nil)
   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
@@ -742,6 +744,10 @@ def self.use_field_for_done_ratio?
     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 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
@@ -848,6 +854,8 @@ def validate_custom_field_values
   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