| @@ -220,8 +220,8 class Issue < ActiveRecord::Base | |||||
| 220 | # Set the done_ratio using the status if that setting is set. This will keep the done_ratios |
|
220 | # Set the done_ratio using the status if that setting is set. This will keep the done_ratios | |
| 221 | # even if the user turns off the setting later |
|
221 | # even if the user turns off the setting later | |
| 222 | def update_done_ratio_from_issue_status |
|
222 | def update_done_ratio_from_issue_status | |
| 223 |
if Issue.use_status_for_done_ratio? && |
|
223 | if Issue.use_status_for_done_ratio? && status && status.default_done_ratio? | |
| 224 |
self.done_ratio = |
|
224 | self.done_ratio = status.default_done_ratio | |
| 225 | end |
|
225 | end | |
| 226 | end |
|
226 | end | |
| 227 |
|
227 | |||
| @@ -24,6 +24,7 class IssueStatus < ActiveRecord::Base | |||||
| 24 | validates_uniqueness_of :name |
|
24 | validates_uniqueness_of :name | |
| 25 | validates_length_of :name, :maximum => 30 |
|
25 | validates_length_of :name, :maximum => 30 | |
| 26 | validates_format_of :name, :with => /^[\w\s\'\-]*$/i |
|
26 | validates_format_of :name, :with => /^[\w\s\'\-]*$/i | |
|
|
27 | validates_inclusion_of :default_done_ratio, :in => 0..100, :allow_nil => true | |||
| 27 |
|
28 | |||
| 28 | def after_save |
|
29 | def after_save | |
| 29 | IssueStatus.update_all("is_default=#{connection.quoted_false}", ['id <> ?', id]) if self.is_default? |
|
30 | IssueStatus.update_all("is_default=#{connection.quoted_false}", ['id <> ?', id]) if self.is_default? | |
| @@ -7,7 +7,7 | |||||
| 7 |
|
7 | |||
| 8 | <% if Issue.use_status_for_done_ratio? %> |
|
8 | <% if Issue.use_status_for_done_ratio? %> | |
| 9 | <p><label for="issue_done_ratio"><%=l(:field_done_ratio)%></label> |
|
9 | <p><label for="issue_done_ratio"><%=l(:field_done_ratio)%></label> | |
| 10 | <%= select 'issue_status', :default_done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p> |
|
10 | <%= select 'issue_status', :default_done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :include_blank => true %></p> | |
| 11 | <% end %> |
|
11 | <% end %> | |
| 12 |
|
12 | |||
| 13 | <p><label for="issue_status_is_closed"><%=l(:field_is_closed)%></label> |
|
13 | <p><label for="issue_status_is_closed"><%=l(:field_is_closed)%></label> | |
General Comments 0
You need to be logged in to leave comments.
Login now