@@ -356,7 +356,7 class IssuesController < ApplicationController | |||||
356 | when 'nullify' |
|
356 | when 'nullify' | |
357 | time_entries.update_all(:issue_id => nil) |
|
357 | time_entries.update_all(:issue_id => nil) | |
358 | when 'reassign' |
|
358 | when 'reassign' | |
359 | reassign_to = @project.issues.find_by_id(params[:reassign_to_id]) |
|
359 | reassign_to = @project && @project.issues.find_by_id(params[:reassign_to_id]) | |
360 | if reassign_to.nil? |
|
360 | if reassign_to.nil? | |
361 | flash.now[:error] = l(:error_issue_not_found_in_project) |
|
361 | flash.now[:error] = l(:error_issue_not_found_in_project) | |
362 | return |
|
362 | return |
@@ -7,8 +7,10 | |||||
7 | <p> |
|
7 | <p> | |
8 | <label><%= radio_button_tag 'todo', 'destroy', true %> <%= l(:text_destroy_time_entries) %></label><br /> |
|
8 | <label><%= radio_button_tag 'todo', 'destroy', true %> <%= l(:text_destroy_time_entries) %></label><br /> | |
9 | <label><%= radio_button_tag 'todo', 'nullify', false %> <%= l(:text_assign_time_entries_to_project) %></label><br /> |
|
9 | <label><%= radio_button_tag 'todo', 'nullify', false %> <%= l(:text_assign_time_entries_to_project) %></label><br /> | |
|
10 | <% if @project %> | |||
10 | <label><%= radio_button_tag 'todo', 'reassign', false, :onchange => 'if (this.checked) { $("#reassign_to_id").focus(); }' %> <%= l(:text_reassign_time_entries) %></label> |
|
11 | <label><%= radio_button_tag 'todo', 'reassign', false, :onchange => 'if (this.checked) { $("#reassign_to_id").focus(); }' %> <%= l(:text_reassign_time_entries) %></label> | |
11 | <%= text_field_tag 'reassign_to_id', params[:reassign_to_id], :size => 6, :onfocus => '$("#todo_reassign").attr("checked", true);' %> |
|
12 | <%= text_field_tag 'reassign_to_id', params[:reassign_to_id], :size => 6, :onfocus => '$("#todo_reassign").attr("checked", true);' %> | |
|
13 | <% end %> | |||
12 | </p> |
|
14 | </p> | |
13 | </div> |
|
15 | </div> | |
14 | <%= submit_tag l(:button_apply) %> |
|
16 | <%= submit_tag l(:button_apply) %> |
General Comments 0
You need to be logged in to leave comments.
Login now