Project

General

Profile

« Previous | Next » 

Revision 9b72da7d

Added by Daniel Lobato Garcia over 10 years ago

fixes #3920 - prevent 500 ScopedSearch errors on the API, raise UI errors correctly

(cherry picked from commit f9bc5a8e5934aac9bd8d5488f84717d33e359501)

View differences:

app/controllers/lookup_keys_controller.rb
before_filter :setup_search_options, :only => :index
def index
begin
values = LookupKey.search_for(params[:search], :order => params[:order])
rescue => e
error e.to_s
values = LookupKey.search_for ""
end
@lookup_keys = values.includes(:puppetclass).paginate(:page => params[:page])
@lookup_keys = LookupKey.search_for(params[:search], :order => params[:order]).includes(:puppetclass).paginate(:page => params[:page])
end
def edit

Also available in: Unified diff