Commit c0c4e39c authored by jplang's avatar jplang
Browse files

Don't show the "reassign" option when deleting issues from different projects (#24722).

git-svn-id: https://svn.redmine.org/redmine/trunk@16121 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent c08305b0
......@@ -356,7 +356,7 @@ class IssuesController < ApplicationController
when 'nullify'
time_entries.update_all(:issue_id => nil)
when 'reassign'
reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
reassign_to = @project && @project.issues.find_by_id(params[:reassign_to_id])
if reassign_to.nil?
flash.now[:error] = l(:error_issue_not_found_in_project)
return
......
......@@ -7,8 +7,10 @@
<p>
<label><%= radio_button_tag 'todo', 'destroy', true %> <%= l(:text_destroy_time_entries) %></label><br />
<label><%= radio_button_tag 'todo', 'nullify', false %> <%= l(:text_assign_time_entries_to_project) %></label><br />
<% if @project %>
<label><%= radio_button_tag 'todo', 'reassign', false, :onchange => 'if (this.checked) { $("#reassign_to_id").focus(); }' %> <%= l(:text_reassign_time_entries) %></label>
<%= text_field_tag 'reassign_to_id', params[:reassign_to_id], :size => 6, :onfocus => '$("#todo_reassign").attr("checked", true);' %>
<% end %>
</p>
</div>
<%= submit_tag l(:button_apply) %>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment