collision-1.1.0.patch

Brian Lindahl, 2011-01-26 22:18

Download (4.07 KB)

View differences:

redmine/app/controllers/issue_moves_controller.rb 2011-01-26 10:42:19.865224800 -0700
55 55
    @target_project ||= @project    
56 56
    @trackers = @target_project.trackers
57 57
    @available_statuses = Workflow.available_statuses(@project)
58
    @found_versions = @target_project.shared_versions.locked
58 59
    @fixed_versions = @target_project.shared_versions.open
59 60
    @categories = @target_project.issue_categories
60 61
    @notes = params[:notes]
......
63 64

  
64 65
  def extract_changed_attributes_for_move(params)
65 66
    changed_attributes = {}
66
    [:assigned_to_id, :status_id, :fixed_version_id, :category_id, :start_date, :due_date, :priority_id].each do |valid_attribute|
67
    [:assigned_to_id, :status_id, :found_version_id, :fixed_version_id, :category_id, :start_date, :due_date, :priority_id].each do |valid_attribute|
67 68
      unless params[valid_attribute].blank?
68 69
        changed_attributes[valid_attribute] = (params[valid_attribute] == 'none' ? nil : params[valid_attribute])
69 70
      end
redmine/app/models/issue.rb 2011-01-26 13:52:35.180526800 -0700
273 273
  safe_attributes 'tracker_id',
274 274
    'status_id',
275 275
    'category_id',
276
    'found_version_id',
276 277
    'custom_field_values',
277 278
    'custom_fields',
278 279
    'lock_version',
......
280 281

  
281 282
  safe_attributes 'assigned_to_id',
282 283
    'priority_id',
283
    'found_version_id',
284 284
    'fixed_version_id',
285 285
    'start_date',
286 286
    'due_date',
redmine/app/views/issues/_attributes.rhtml 2011-01-26 10:38:30.757316100 -0700
18 18
                     :title => l(:label_issue_category_new), 
19 19
                     :tabindex => 199) if authorize_for('issue_categories', 'new') %></p>
20 20
<% end %>
21
<% unless @issue.assignable_versions.empty? %>
22
<p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), {:include_blank => true}, :disabled => !@issue.planning_editable? %>
21
<% unless @issue.found_assignable_versions.empty? %>
22
<p><%= f.select :found_version_id, version_options_for_select(@issue.found_assignable_versions, @issue.found_version), :include_blank => true, :required => true %></p>
23
<% end %>
24
<% unless @issue.fixed_assignable_versions.empty? %>
25
<p><%= f.select :fixed_version_id, version_options_for_select(@issue.fixed_assignable_versions, @issue.fixed_version), {:include_blank => true}, :disabled => !@issue.planning_editable? %>
23 26
<%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'),
24 27
                     l(:label_version_new),
25 28
                     'version[name]', 
redmine/app/views/issues/_form_update.rhtml 2011-01-26 13:20:38.507558100 -0700
7 7
<% if Issue.use_field_for_done_ratio? %>
8 8
<p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10]}), {}, :disabled => !@issue.progress_editable? %></p>
9 9
<% end %>
10
<% unless @issue.assignable_versions.empty? %>
11
<p><%= f.select :fixed_version_id, (@issue.assignable_versions.collect {|v| [v.name, v.id]}), {:include_blank => true}, :disabled => !@issue.planning_editable? %></p>
10
<% unless @issue.fixed_assignable_versions.empty? %>
11
<p><%= f.select :fixed_version_id, (@issue.fixed_assignable_versions.collect {|v| [v.name, v.id]}), {:include_blank => true}, :disabled => !@issue.planning_editable? %></p>
12 12
<% end %>
13 13
</div>
14 14
</div>