github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-19 04:02:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: permalink redirects with subfolder

Browse Source
This commit is contained in:
Neil Lalonde 2018-08-09 11:05:08 -04:00
parent 701c5ae781
commit 2c4d7225d8
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/application_controller.rb
View File

@ -224,13 +224,8 @@ class ApplicationController < ActionController::Base
if permalink.present?
# permalink present, redirect to that URL
if permalink.external_url
redirect_with_client_support permalink.external_url, status: :moved_permanently
return
elsif permalink.target_url
redirect_with_client_support "#{Discourse::base_uri}#{permalink.target_url}", status: :moved_permanently
return
end
redirect_with_client_support permalink.target_url, status: :moved_permanently
return
end
end

28
spec/requests/application_controller_spec.rb
View File

@ -37,6 +37,34 @@ RSpec.describe ApplicationController do
expect(response.body).to eq(external_url)
end
it 'supports subfolder with permalinks' do
GlobalSetting.stubs(:relative_url_root).returns('/forum')
Discourse.stubs(:base_uri).returns("/forum")
trashed_topic = create_post.topic
trashed_topic.trash!
new_topic = create_post.topic
permalink = Permalink.create!(url: trashed_topic.relative_url, topic_id: new_topic.id)
# no subfolder because router doesn't know about subfolder in this test
get "/t/#{trashed_topic.slug}/#{trashed_topic.id}"
expect(response.status).to eq(301)
expect(response).to redirect_to("/forum/t/#{new_topic.slug}/#{new_topic.id}")
permalink.destroy
category = Fabricate(:category)
permalink = Permalink.create!(url: trashed_topic.relative_url, category_id: category.id)
get "/t/#{trashed_topic.slug}/#{trashed_topic.id}"
expect(response.status).to eq(301)
expect(response).to redirect_to("/forum/c/#{category.slug}")
permalink.destroy
permalink = Permalink.create!(url: trashed_topic.relative_url, post_id: new_topic.posts.last.id)
get "/t/#{trashed_topic.slug}/#{trashed_topic.id}"
expect(response.status).to eq(301)
expect(response).to redirect_to("/forum/t/#{new_topic.slug}/#{new_topic.id}/#{new_topic.posts.last.post_number}")
end
it 'should return 404 and show Google search' do
get "/t/nope-nope/99999999"
expect(response.status).to eq(404)