Skip to content

Commit

Permalink
Merge pull request Katello#1339 from komidore64/brackets
Browse files Browse the repository at this point in the history
880515 - [ALL_LANG][headpin CLI] Redundant brackets in the message of
  • Loading branch information
komidore64 committed Jan 9, 2013
2 parents d4b5494 + b61a74f commit c42d8ce
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/app/controllers/api/api_controller.rb
Expand Up @@ -186,9 +186,10 @@ def render_wrapped_exception(status_code, ex)
logger.error "REQUEST URL: #{request.fullpath}"
logger.error pp_exception(ex.original.nil? ? ex : ex.original)
orig_message = (ex.original.nil? && '') || ex.original.message
format_text_orig_message = (orig_message.blank?) ? '' : " (#{orig_message})"
respond_to do |format|
format.json { render :json => {:displayMessage => ex.message, :errors => [ ex.message, orig_message ]}, :status => status_code }
format.all { render :text => "#{ex.message} (#{orig_message})", :status => status_code }
format.all { render :text => "#{ex.message}#{format_text_orig_message}", :status => status_code }
end
end

Expand Down

0 comments on commit c42d8ce

Please sign in to comment.