Allow blank value for IssueStatus#default_done_ratio.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3157 e93f8b46-1217-0410-a6f0-8f06a7374b81

Allow blank value for IssueStatus#default_done_ratio.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3157 e93f8b46-1217-0410-a6f0-8f06a7374b81
d905f2ce · Jean-Philippe Lang · d7277861 · d905f2ce · d905f2ce · d905f2ce
Commit d905f2ce authored Dec 12, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

issue.rb app/models/issue.rb +2 -2

issue_status.rb app/models/issue_status.rb +1 -0

_form.rhtml app/views/issue_statuses/_form.rhtml +1 -1

No files found.
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -220,8 +220,8 @@ class Issue < ActiveRecord::Base
  # Set the done_ratio using the status if that setting is set.  This will keep the done_ratios
  # even if the user turns off the setting later
  def update_done_ratio_from_issue_status
-    if Issue.use_status_for_done_ratio? && !self.status.default_done_ratio.blank?
+    if Issue.use_status_for_done_ratio? && status && status.default_done_ratio?
-      self.done_ratio = self.status.default_done_ratio
+      self.done_ratio = status.default_done_ratio
    end
  end

--- a/app/models/issue_status.rb
+++ b/app/models/issue_status.rb
@@ -24,6 +24,7 @@ class IssueStatus < ActiveRecord::Base
  validates_uniqueness_of :name
  validates_length_of :name, :maximum => 30
  validates_format_of :name, :with => /^[\w\s\'\-]*$/i
+  validates_inclusion_of :default_done_ratio, :in => 0..100, :allow_nil => true
  def after_save
    IssueStatus.update_all("is_default=#{connection.quoted_false}", ['id <> ?', id]) if self.is_default?

--- a/app/views/issue_statuses/_form.rhtml
+++ b/app/views/issue_statuses/_form.rhtml
@@ -7,7 +7,7 @@
 <% if Issue.use_status_for_done_ratio? %>
 <p><label for="issue_done_ratio"><%=l(:field_done_ratio)%></label>
-<%= select 'issue_status', :default_done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
+<%= select 'issue_status', :default_done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :include_blank => true %></p>
 <% end %>
 <p><label for="issue_status_is_closed"><%=l(:field_is_closed)%></label>