Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2720 from techAPJ/patch-3 

FIX: do not redirect topic for JSON request
This commit is contained in:
Robin Ward 2014-08-29 13:59:45 -04:00
parent 926e45d030 84d0b599a4
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
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
@ -404,7 +404,7 @@ class TopicsController < ApplicationController
username: request['u'],
ip_address: request.remote_ip
)
end unless request.xhr?
end unless request.format.json?
Scheduler::Defer.later "Track Visit" do
TopicViewItem.add(topic_id, ip, user_id)
@ -416,7 +416,7 @@ class TopicsController < ApplicationController
end
def should_track_visit_to_topic?
!!((!request.xhr? || params[:track_visit]) && current_user)
!!((!request.format.json? || params[:track_visit]) && current_user)
end
def perform_show_response