github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 17:33:27 +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

5
app/controllers/application_controller.rb
View File

@ -66,6 +66,9 @@ class ApplicationController < ActionController::Base
rescue_from Discourse::NotFound do rescue_from Discourse::NotFound do
if request.format && request.format.json?
render status: 404, layout: false, text: "[error: 'not found']"
else
f = Topic.where(deleted_at: nil, archetype: "regular") f = Topic.where(deleted_at: nil, archetype: "regular")
@latest = f.order('views desc').take(10) @latest = f.order('views desc').take(10)
@recent = f.order('created_at desc').take(10) @recent = f.order('created_at desc').take(10)
@ -74,6 +77,8 @@ class ApplicationController < ActionController::Base
render status: 404, layout: 'no_js', template: '/exceptions/not_found' render status: 404, layout: 'no_js', template: '/exceptions/not_found'
end end
end
rescue_from Discourse::InvalidAccess do rescue_from Discourse::InvalidAccess do
render file: 'public/403', formats: [:html], layout: false, status: 403 render file: 'public/403', formats: [:html], layout: false, status: 403
end end