Skip to content

O
OHR Support
Commit 488879d9 authored by Eric Davis's avatar Eric Davis
Browse files
Options

Refactor: pull #query_statement_invalid up to ApplicationController. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3696 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent e65c3cfc
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 17 deletions
app/controllers/application_controller.rb
View file @ 488879d9
......@@ -329,4 +329,13 @@ class ApplicationController < ActionController::Base
def render_attachment_warning_if_needed(obj)
flash[:warning] = l(:warning_attachments_not_saved, obj.unsaved_attachments.size) if obj.unsaved_attachments.present?
end
# Rescues an invalid query statement. Just in case...
def query_statement_invalid(exception)
logger.error "Query::StatementInvalid: #{exception.message}" if logger
session.delete(:query)
sort_clear if respond_to?(:sort_clear)
render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
end
end
app/controllers/gantts_controller.rb
View file @ 488879d9
......@@ -7,6 +7,8 @@ class GanttsController < ApplicationController
helper :projects
helper :queries
include QueriesHelper
helper :sort
include SortHelper
include Redmine::Export::PDF
def show
......@@ -42,15 +44,6 @@ class GanttsController < ApplicationController
private
# Rescues an invalid query statement. Just in case...
# TODO: Refactor, move to ApplicationController with IssuesController
def query_statement_invalid(exception)
logger.error "Query::StatementInvalid: #{exception.message}" if logger
session.delete(:query)
sort_clear
render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
end
# TODO: Refactor, duplicates IssuesController
def find_optional_project
@project = Project.find(params[:project_id]) unless params[:project_id].blank?
......
app/controllers/issues_controller.rb
View file @ 488879d9
......@@ -453,14 +453,6 @@ private
render_404
end
# Rescues an invalid query statement. Just in case...
def query_statement_invalid(exception)
logger.error "Query::StatementInvalid: #{exception.message}" if logger
session.delete(:query)
sort_clear
render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
end
# Used by #edit and #update to set some common instance variables
# from the params
# TODO: Refactor, not everything in here is needed by #edit
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment