From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Thu, 19 Aug 2010 04:32:42 +0000 (+0000)
Subject: Merged r3930 from trunk.
X-Git-Tag: 1.0.1~38
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b5b8d34d942f7fb486f344629a622f81a6ef008f;p=redmine.git

Merged r3930 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3980 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 7fb4148ed..a7e227c85 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -251,6 +251,18 @@ class IssuesController < ApplicationController
   end
 
   def move
+    @issues.sort!
+    @copy = params[:copy_options] && params[:copy_options][:copy]
+    @allowed_projects = Issue.allowed_target_projects_on_move
+    @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
+    @target_project ||= @project    
+    @trackers = @target_project.trackers
+    @available_statuses = Workflow.available_statuses(@project)
+    render :layout => false if request.xhr?
+  end
+
+  # TODO: more descriptive name? move to separate controller like IssueMovesController?
+  def perform_move
     @issues.sort!
     @copy = params[:copy_options] && params[:copy_options][:copy]
     @allowed_projects = Issue.allowed_target_projects_on_move
@@ -285,12 +297,6 @@ class IssuesController < ApplicationController
       end
       return
     end
-    render :layout => false if request.xhr?
-  end
-
-  # TODO: more descriptive name? move to separate controller like IssueMovesController?
-  def perform_move
-    move
   end
   
   def destroy