kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor: Extract method for setting the flash on bulk issue saves. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3560 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis 2010-03-11 16:34:08 +00:00
parent 3e2e5a0a0c
commit c7c3c0cc7c
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/controllers/issues_controller.rb
View File

@ -262,13 +262,7 @@ class IssuesController < ApplicationController
unsaved_issue_ids << issue.id unsaved_issue_ids << issue.id
end end
end end
if unsaved_issue_ids.empty? set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids)
flash[:notice] = l(:notice_successful_update) unless @issues.empty?
else
flash[:error] = l(:notice_failed_to_save_issues, :count => unsaved_issue_ids.size,
:total => @issues.size,
:ids => '#' + unsaved_issue_ids.join(', #'))
end
redirect_back_or_default({:controller => 'issues', :action => 'index', :project_id => @project}) redirect_back_or_default({:controller => 'issues', :action => 'index', :project_id => @project})
return return
end end
@ -309,13 +303,8 @@ class IssuesController < ApplicationController
unsaved_issue_ids << issue.id unsaved_issue_ids << issue.id
end end
end end
if unsaved_issue_ids.empty? set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids)
flash[:notice] = l(:notice_successful_update) unless @issues.empty?
else
flash[:error] = l(:notice_failed_to_save_issues, :count => unsaved_issue_ids.size,
:total => @issues.size,
:ids => '#' + unsaved_issue_ids.join(', #'))
end
if params[:follow] if params[:follow]
if @issues.size == 1 && moved_issues.size == 1 if @issues.size == 1 && moved_issues.size == 1
redirect_to :controller => 'issues', :action => 'show', :id => moved_issues.first redirect_to :controller => 'issues', :action => 'show', :id => moved_issues.first
@ -568,4 +557,15 @@ private
end end
end 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?
else
flash[:error] = l(:notice_failed_to_save_issues,
:count => unsaved_issue_ids.size,
:total => issues.size,
:ids => '#' + unsaved_issue_ids.join(', #'))
end
end
end end