codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-03-14 00:50:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: Include preloaded data even if the request type isn't explicitly text/html

Browse source
This commit is contained in:
Robin Ward 2013-06-04 12:56:12 -04:00
parent 4392a17b54
commit 02b1f78410
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/controllers/application_controller.rb
View file

@ -97,21 +97,23 @@ class ApplicationController < ActionController::Base
# If we are rendering HTML, preload the session data
def preload_json
if request.format && request.format.html?
if guardian.current_user
guardian.current_user.sync_notification_channel_position
end
store_preloaded("site", Site.cached_json(current_user))
# We don't preload JSON on xhr or JSON request
return if request.xhr?
if current_user.present?
store_preloaded("currentUser", MultiJson.dump(CurrentUserSerializer.new(current_user, root: false)))
serializer = ActiveModel::ArraySerializer.new(TopicTrackingState.report([current_user.id]), each_serializer: TopicTrackingStateSerializer)
store_preloaded("topicTrackingStates", MultiJson.dump(serializer))
end
store_preloaded("siteSettings", SiteSetting.client_settings_json)
if guardian.current_user
guardian.current_user.sync_notification_channel_position
end
store_preloaded("site", Site.cached_json(current_user))
if current_user.present?
store_preloaded("currentUser", MultiJson.dump(CurrentUserSerializer.new(current_user, root: false)))
serializer = ActiveModel::ArraySerializer.new(TopicTrackingState.report([current_user.id]), each_serializer: TopicTrackingStateSerializer)
store_preloaded("topicTrackingStates", MultiJson.dump(serializer))
end
store_preloaded("siteSettings", SiteSetting.client_settings_json)
end