diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2009-12-11 18:48:34 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2009-12-11 18:48:34 +0000 |
| commit | 4fe14e71c2d76a2e92da0aaa71e18493d65b1fc1 (patch) | |
| tree | 0ef000f0e3985772228928b0acdca1a292f82ef6 /app/views/issues | |
| parent | a83501364d0aa5e5e6d7a9e4ccfa2be5dab555b0 (diff) | |
| download | redmine-4fe14e71c2d76a2e92da0aaa71e18493d65b1fc1.tar.gz redmine-4fe14e71c2d76a2e92da0aaa71e18493d65b1fc1.zip | |
Adds a Setting to control how an Issue's done_ratio is calculated:
* Issue field (default) - the done_ratio field for the Issue
* Issue status - uses the Issue Status's value
#4274
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3151 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/issues')
| -rw-r--r-- | app/views/issues/_attributes.rhtml | 2 | ||||
| -rw-r--r-- | app/views/issues/_form_update.rhtml | 2 | ||||
| -rw-r--r-- | app/views/issues/bulk_edit.rhtml | 2 | ||||
| -rw-r--r-- | app/views/issues/context_menu.rhtml | 3 |
4 files changed, 8 insertions, 1 deletions
diff --git a/app/views/issues/_attributes.rhtml b/app/views/issues/_attributes.rhtml index 9adf0f153..f8fc8d672 100644 --- a/app/views/issues/_attributes.rhtml +++ b/app/views/issues/_attributes.rhtml @@ -34,7 +34,9 @@ <p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %></p> <p><%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %></p> <p><%= f.text_field :estimated_hours, :size => 3 %> <%= l(:field_hours) %></p> +<% if Issue.use_field_for_done_ratio? %> <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p> +<% end %> </div> <div style="clear:both;"> </div> diff --git a/app/views/issues/_form_update.rhtml b/app/views/issues/_form_update.rhtml index 5304ee23a..e29c41a7c 100644 --- a/app/views/issues/_form_update.rhtml +++ b/app/views/issues/_form_update.rhtml @@ -4,7 +4,9 @@ <p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p> </div> <div class="splitcontentright"> +<% if Issue.use_field_for_done_ratio? %> <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p> +<% end %> <% unless @issue.assignable_versions.empty? %> <p><%= f.select :fixed_version_id, (@issue.assignable_versions.collect {|v| [v.name, v.id]}), :include_blank => true %></p> <% end %> diff --git a/app/views/issues/bulk_edit.rhtml b/app/views/issues/bulk_edit.rhtml index f428566b2..b298c3c46 100644 --- a/app/views/issues/bulk_edit.rhtml +++ b/app/views/issues/bulk_edit.rhtml @@ -39,8 +39,10 @@ <%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %></label> <label><%= l(:field_due_date) %>: <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %></label> +<% if Issue.use_field_for_done_ratio? %> <label><%= l(:field_done_ratio) %>: <%= select_tag 'done_ratio', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></label> +<% end %> </p> <% @custom_fields.each do |custom_field| %> diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml index 6cb05606a..4a1d0c310 100644 --- a/app/views/issues/context_menu.rhtml +++ b/app/views/issues/context_menu.rhtml @@ -77,6 +77,7 @@ </ul> </li> <% end -%> + <% if Issue.use_field_for_done_ratio? %> <li class="folder"> <a href="#" class="submenu"><%= l(:field_done_ratio) %></a> <ul> @@ -86,7 +87,7 @@ <% end -%> </ul> </li> - + <% end %> <% if !@issue.nil? %> <% if @can[:log_time] -%> <li><%= context_menu_link l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, |