@@ -251,25 +251,14 class IssuesController < ApplicationController | |||||
251 | end |
|
251 | end | |
252 |
|
252 | |||
253 | def move |
|
253 | def move | |
254 | @issues.sort! |
|
254 | prepare_for_issue_move | |
255 | @copy = params[:copy_options] && params[:copy_options][:copy] |
|
|||
256 | @allowed_projects = Issue.allowed_target_projects_on_move |
|
|||
257 | @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id] |
|
|||
258 | @target_project ||= @project |
|
|||
259 | @trackers = @target_project.trackers |
|
|||
260 | @available_statuses = Workflow.available_statuses(@project) |
|
|||
261 | render :layout => false if request.xhr? |
|
255 | render :layout => false if request.xhr? | |
262 | end |
|
256 | end | |
263 |
|
257 | |||
264 | # TODO: more descriptive name? move to separate controller like IssueMovesController? |
|
258 | # TODO: more descriptive name? move to separate controller like IssueMovesController? | |
265 | def perform_move |
|
259 | def perform_move | |
266 | @issues.sort! |
|
260 | prepare_for_issue_move | |
267 | @copy = params[:copy_options] && params[:copy_options][:copy] |
|
261 | ||
268 | @allowed_projects = Issue.allowed_target_projects_on_move |
|
|||
269 | @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id] |
|
|||
270 | @target_project ||= @project |
|
|||
271 | @trackers = @target_project.trackers |
|
|||
272 | @available_statuses = Workflow.available_statuses(@project) |
|
|||
273 | if request.post? |
|
262 | if request.post? | |
274 | new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id]) |
|
263 | new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id]) | |
275 | unsaved_issue_ids = [] |
|
264 | unsaved_issue_ids = [] | |
@@ -473,6 +462,16 private | |||||
473 | @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true) |
|
462 | @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true) | |
474 | end |
|
463 | end | |
475 |
|
464 | |||
|
465 | def prepare_for_issue_move | |||
|
466 | @issues.sort! | |||
|
467 | @copy = params[:copy_options] && params[:copy_options][:copy] | |||
|
468 | @allowed_projects = Issue.allowed_target_projects_on_move | |||
|
469 | @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id] | |||
|
470 | @target_project ||= @project | |||
|
471 | @trackers = @target_project.trackers | |||
|
472 | @available_statuses = Workflow.available_statuses(@project) | |||
|
473 | end | |||
|
474 | ||||
476 | def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids) |
|
475 | def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids) | |
477 | if unsaved_issue_ids.empty? |
|
476 | if unsaved_issue_ids.empty? | |
478 | flash[:notice] = l(:notice_successful_update) unless issues.empty? |
|
477 | flash[:notice] = l(:notice_successful_update) unless issues.empty? |
General Comments 0
You need to be logged in to leave comments.
Login now