Refactor

Author: fkdkent

app/models/issue.rb

@@ -746,6 +746,10 @@ 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

app/views/issues/_attributes.html.erb

@@ -84,7 +84,7 @@
 <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? || Issue.use_issue_field_and_closed_status_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

@@ -175,7 +175,7 @@
 </p>
 <% end %>
 
-<% if @safe_attributes.include?('done_ratio') && (Issue.use_field_for_done_ratio? || Issue.use_issue_field_and_closed_status_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]) %>