diff -ur redmine-1.1.0-all/app/controllers/issue_moves_controller.rb redmine/app/controllers/issue_moves_controller.rb --- redmine-1.1.0-all/app/controllers/issue_moves_controller.rb 2011-01-26 14:04:30.585719400 -0700 +++ redmine/app/controllers/issue_moves_controller.rb 2011-01-26 10:42:19.865224800 -0700 @@ -55,6 +55,7 @@ @target_project ||= @project @trackers = @target_project.trackers @available_statuses = Workflow.available_statuses(@project) + @found_versions = @target_project.shared_versions.locked @fixed_versions = @target_project.shared_versions.open @categories = @target_project.issue_categories @notes = params[:notes] @@ -63,7 +64,7 @@ def extract_changed_attributes_for_move(params) changed_attributes = {} - [:assigned_to_id, :status_id, :fixed_version_id, :category_id, :start_date, :due_date, :priority_id].each do |valid_attribute| + [:assigned_to_id, :status_id, :found_version_id, :fixed_version_id, :category_id, :start_date, :due_date, :priority_id].each do |valid_attribute| unless params[valid_attribute].blank? changed_attributes[valid_attribute] = (params[valid_attribute] == 'none' ? nil : params[valid_attribute]) end diff -ur redmine-1.1.0-all/app/models/issue.rb redmine/app/models/issue.rb --- redmine-1.1.0-all/app/models/issue.rb 2011-01-26 14:04:39.288788700 -0700 +++ redmine/app/models/issue.rb 2011-01-26 13:52:35.180526800 -0700 @@ -273,6 +273,7 @@ safe_attributes 'tracker_id', 'status_id', 'category_id', + 'found_version_id', 'custom_field_values', 'custom_fields', 'lock_version', @@ -280,7 +281,6 @@ safe_attributes 'assigned_to_id', 'priority_id', - 'found_version_id', 'fixed_version_id', 'start_date', 'due_date', diff -ur redmine-1.1.0-all/app/views/issues/_attributes.rhtml redmine/app/views/issues/_attributes.rhtml --- redmine-1.1.0-all/app/views/issues/_attributes.rhtml 2011-01-26 14:04:30.601344300 -0700 +++ redmine/app/views/issues/_attributes.rhtml 2011-01-26 10:38:30.757316100 -0700 @@ -18,8 +18,11 @@ :title => l(:label_issue_category_new), :tabindex => 199) if authorize_for('issue_categories', 'new') %>

<% end %> -<% unless @issue.assignable_versions.empty? %> -

<%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), {:include_blank => true}, :disabled => !@issue.planning_editable? %> +<% unless @issue.found_assignable_versions.empty? %> +

<%= f.select :found_version_id, version_options_for_select(@issue.found_assignable_versions, @issue.found_version), :include_blank => true, :required => true %>

+<% end %> +<% unless @issue.fixed_assignable_versions.empty? %> +

<%= f.select :fixed_version_id, version_options_for_select(@issue.fixed_assignable_versions, @issue.fixed_version), {:include_blank => true}, :disabled => !@issue.planning_editable? %> <%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'), l(:label_version_new), 'version[name]', diff -ur redmine-1.1.0-all/app/views/issues/_form_update.rhtml redmine/app/views/issues/_form_update.rhtml --- redmine-1.1.0-all/app/views/issues/_form_update.rhtml 2011-01-26 14:04:30.601344300 -0700 +++ redmine/app/views/issues/_form_update.rhtml 2011-01-26 13:20:38.507558100 -0700 @@ -7,8 +7,8 @@ <% if Issue.use_field_for_done_ratio? %>

<%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10]}), {}, :disabled => !@issue.progress_editable? %>

<% end %> -<% unless @issue.assignable_versions.empty? %> -

<%= f.select :fixed_version_id, (@issue.assignable_versions.collect {|v| [v.name, v.id]}), {:include_blank => true}, :disabled => !@issue.planning_editable? %>

+<% unless @issue.fixed_assignable_versions.empty? %> +

<%= f.select :fixed_version_id, (@issue.fixed_assignable_versions.collect {|v| [v.name, v.id]}), {:include_blank => true}, :disabled => !@issue.planning_editable? %>

<% end %>