meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-28 01:57:14 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16121 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-12-31 15:26:00 +00:00
parent 1b30422354
commit 1bda8ce940
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/issues_controller.rb
View File

@ -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

2
app/views/issues/destroy.html.erb
View File

@ -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) %>