IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

move arbitrary html content out of noscript and into the preloadstore

Browse Source
This commit is contained in:
Régis Hanol
2013-12-17 18:25:27 +01:00
parent 1b6050bdb0
commit 4c6b535cc0
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/application_controller.rb
View File

@@ -191,6 +191,7 @@ class ApplicationController < ActionController::Base
def preload_anonymous_data
store_preloaded("site", Site.cached_json(guardian))
store_preloaded("siteSettings", SiteSetting.client_settings_json)
store_preloaded("htmlContent", html_content_json)
end
def preload_current_user_data
@@ -199,6 +200,13 @@ class ApplicationController < ActionController::Base
store_preloaded("topicTrackingStates", MultiJson.dump(serializer))
end
def html_content_json
MultiJson.dump({
top: SiteContent.content_for(:top),
bottom: SiteContent.content_for(:bottom),
})
end
def render_json_error(obj)
if obj.present?
render json: MultiJson.dump(errors: obj.errors.full_messages), status: 422