Merged r11854 from trunk (#13783).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11995 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-11 17:51:19 +00:00
parent b5998b59ab
commit 9874a61ec3
3 changed files with 12 additions and 7 deletions
@@ -70,12 +70,10 @@ class EnumerationsController < ApplicationController
      @enumeration.destroy
      redirect_to enumerations_path
      return
-    elsif params[:reassign_to_id]
-      if reassign_to = @enumeration.class.find_by_id(params[:reassign_to_id])
-        @enumeration.destroy(reassign_to)
-        redirect_to enumerations_path
-        return
-      end
+    elsif params[:reassign_to_id].present? && (reassign_to = @enumeration.class.find_by_id(params[:reassign_to_id].to_i))
+      @enumeration.destroy(reassign_to)
+      redirect_to enumerations_path
+      return
    end
    @enumerations = @enumeration.class.system.all - [@enumeration]
  end