discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-09 14:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2720 from techAPJ/patch-3

Browse Source 
FIX: do not redirect topic for JSON request
This commit is contained in:
Robin Ward 2014-08-29 13:59:45 -04:00
commit 9062719480
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/topics_controller.rb
View File

@ -52,7 +52,7 @@ class TopicsController < ApplicationController
discourse_expires_in 1.minute discourse_expires_in 1.minute
redirect_to_correct_topic(@topic_view.topic, opts[:post_number]) && return if slugs_do_not_match || (!request.xhr? && params[:slug].nil?) redirect_to_correct_topic(@topic_view.topic, opts[:post_number]) && return if slugs_do_not_match || (!request.format.json? && params[:slug].nil?)
track_visit_to_topic track_visit_to_topic
@ -404,7 +404,7 @@ class TopicsController < ApplicationController
username: request['u'], username: request['u'],
ip_address: request.remote_ip ip_address: request.remote_ip
) )
end unless request.xhr? end unless request.format.json?
Scheduler::Defer.later "Track Visit" do Scheduler::Defer.later "Track Visit" do
TopicViewItem.add(topic_id, ip, user_id) TopicViewItem.add(topic_id, ip, user_id)
@ -416,7 +416,7 @@ class TopicsController < ApplicationController
end end
def should_track_visit_to_topic? def should_track_visit_to_topic?
!!((!request.xhr? || params[:track_visit]) && current_user) !!((!request.format.json? || params[:track_visit]) && current_user)
end end
def perform_show_response def perform_show_response