Skip to content

Commit

Permalink
Refactor: extract method from #move and #perform_move.
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3932 e93f8b46-1217-0410-a6f0-8f06a7374b81
  • Loading branch information
edavis10 committed Aug 10, 2010
1 parent 424b482 commit 52c624a
Showing 1 changed file with 13 additions and 14 deletions.
27 changes: 13 additions & 14 deletions app/controllers/issues_controller.rb
Expand Up @@ -251,25 +251,14 @@ def bulk_edit
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)
prepare_for_issue_move
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
@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)
prepare_for_issue_move

if request.post?
new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
unsaved_issue_ids = []
Expand Down Expand Up @@ -473,6 +462,16 @@ def build_new_issue_from_params
@allowed_statuses = @issue.new_statuses_allowed_to(User.current, true)
end

def prepare_for_issue_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)
end

def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids)
if unsaved_issue_ids.empty?
flash[:notice] = l(:notice_successful_update) unless issues.empty?
Expand Down

0 comments on commit 52c624a

Please sign in to comment.