github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 11:01:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

proper 404 for json request 404

Browse Source
This commit is contained in:
Sam
2013-05-20 17:28:32 +10:00
parent e91ed83586
commit fc57578c85
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/controllers/application_controller.rb
View File

@ -66,12 +66,17 @@ class ApplicationController < ActionController::Base
rescue_from Discourse::NotFound do rescue_from Discourse::NotFound do
f = Topic.where(deleted_at: nil, archetype: "regular") if request.format && request.format.json?
@latest = f.order('views desc').take(10) render status: 404, layout: false, text: "[error: 'not found']"
@recent = f.order('created_at desc').take(10) else
@slug = params[:slug].class == String ? params[:slug] : '' f = Topic.where(deleted_at: nil, archetype: "regular")
@slug.gsub!('-',' ') @latest = f.order('views desc').take(10)
render status: 404, layout: 'no_js', template: '/exceptions/not_found' @recent = f.order('created_at desc').take(10)
@slug = params[:slug].class == String ? params[:slug] : ''
@slug.gsub!('-',' ')
render status: 404, layout: 'no_js', template: '/exceptions/not_found'
end
end end
rescue_from Discourse::InvalidAccess do rescue_from Discourse::InvalidAccess do