| @@ -262,13 +262,7 class IssuesController < ApplicationController | |||
|
|
262 | 262 | unsaved_issue_ids << issue.id |
|
|
263 | 263 | end |
|
|
264 | 264 | end |
|
|
265 | if unsaved_issue_ids.empty? | |
|
|
266 | flash[:notice] = l(:notice_successful_update) unless @issues.empty? | |
|
|
267 | else | |
|
|
268 | flash[:error] = l(:notice_failed_to_save_issues, :count => unsaved_issue_ids.size, | |
|
|
269 | :total => @issues.size, | |
|
|
270 | :ids => '#' + unsaved_issue_ids.join(', #')) | |
|
|
271 | end | |
|
|
265 | set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids) | |
|
|
272 | 266 | redirect_back_or_default({:controller => 'issues', :action => 'index', :project_id => @project}) |
|
|
273 | 267 | return |
|
|
274 | 268 | end |
| @@ -309,13 +303,8 class IssuesController < ApplicationController | |||
|
|
309 | 303 | unsaved_issue_ids << issue.id |
|
|
310 | 304 | end |
|
|
311 | 305 | end |
|
|
312 | if unsaved_issue_ids.empty? | |
|
|
313 | flash[:notice] = l(:notice_successful_update) unless @issues.empty? | |
|
|
314 | else | |
|
|
315 | flash[:error] = l(:notice_failed_to_save_issues, :count => unsaved_issue_ids.size, | |
|
|
316 | :total => @issues.size, | |
|
|
317 | :ids => '#' + unsaved_issue_ids.join(', #')) | |
|
|
318 | end | |
|
|
306 | set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids) | |
|
|
307 | ||
|
|
319 | 308 | if params[:follow] |
|
|
320 | 309 | if @issues.size == 1 && moved_issues.size == 1 |
|
|
321 | 310 | redirect_to :controller => 'issues', :action => 'show', :id => moved_issues.first |
| @@ -568,4 +557,15 private | |||
|
|
568 | 557 | end |
|
|
569 | 558 | |
|
|
570 | 559 | end |
|
|
560 | ||
|
|
561 | def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids) | |
|
|
562 | if unsaved_issue_ids.empty? | |
|
|
563 | flash[:notice] = l(:notice_successful_update) unless issues.empty? | |
|
|
564 | else | |
|
|
565 | flash[:error] = l(:notice_failed_to_save_issues, | |
|
|
566 | :count => unsaved_issue_ids.size, | |
|
|
567 | :total => issues.size, | |
|
|
568 | :ids => '#' + unsaved_issue_ids.join(', #')) | |
|
|
569 | end | |
|
|
570 | end | |
|
|
571 | 571 | end |
General Comments 0
You need to be logged in to leave comments.
Login now