##// END OF EJS Templates
Refactor: extract error to new method with before_filter....
Eric Davis -
r3576:dfc448030d17
parent child
Show More
@@ -24,6 +24,7 class IssuesController < ApplicationController
24 before_filter :find_project, :only => [:new, :create, :update_form, :preview, :auto_complete]
24 before_filter :find_project, :only => [:new, :create, :update_form, :preview, :auto_complete]
25 before_filter :authorize, :except => [:index, :changes, :gantt, :calendar, :preview, :context_menu]
25 before_filter :authorize, :except => [:index, :changes, :gantt, :calendar, :preview, :context_menu]
26 before_filter :find_optional_project, :only => [:index, :changes, :gantt, :calendar]
26 before_filter :find_optional_project, :only => [:index, :changes, :gantt, :calendar]
27 before_filter :check_for_default_issue_status, :only => [:new, :create]
27 before_filter :build_new_issue_from_params, :only => [:new, :create]
28 before_filter :build_new_issue_from_params, :only => [:new, :create]
28 accept_key_auth :index, :show, :changes
29 accept_key_auth :index, :show, :changes
29
30
@@ -557,10 +558,6 private
557 render_error l(:error_no_tracker_in_project)
558 render_error l(:error_no_tracker_in_project)
558 return false
559 return false
559 end
560 end
560 if @issue.status.nil?
561 render_error l(:error_no_default_issue_status)
562 return false
563 end
564 if params[:issue].is_a?(Hash)
561 if params[:issue].is_a?(Hash)
565 @issue.safe_attributes = params[:issue]
562 @issue.safe_attributes = params[:issue]
566 @issue.watcher_user_ids = params[:issue]['watcher_user_ids'] if User.current.allowed_to?(:add_issue_watchers, @project)
563 @issue.watcher_user_ids = params[:issue]['watcher_user_ids'] if User.current.allowed_to?(:add_issue_watchers, @project)
@@ -581,4 +578,11 private
581 :ids => '#' + unsaved_issue_ids.join(', #'))
578 :ids => '#' + unsaved_issue_ids.join(', #'))
582 end
579 end
583 end
580 end
581
582 def check_for_default_issue_status
583 if IssueStatus.default.nil?
584 render_error l(:error_no_default_issue_status)
585 return false
586 end
587 end
584 end
588 end
General Comments 0
You need to be logged in to leave comments. Login now