Download as
Browse Code »

Commit 8e8f96761f61948c18a57a1e1461eb8d85273519

Authored by Antonio Terceiro
1 parent 74537cad
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Fix redirection to renamed articles in profiles with their own domain 

ActionItem2420
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/controllers/public/content_viewer_controller.rb
  Diff comments   View file @8e8f967
@@ -19,7 +19,7 @@ class ContentViewerController < ApplicationController @@ -19,7 +19,7 @@ class ContentViewerController < ApplicationController
19 unless @page 19 unless @page
20 page_from_old_path = profile.articles.find_by_old_path(path) 20 page_from_old_path = profile.articles.find_by_old_path(path)
21 if page_from_old_path 21 if page_from_old_path
22 - redirect_to :profile => profile.identifier, :page => page_from_old_path.explode_path 22 + redirect_to profile.url.merge(:page => page_from_old_path.explode_path)
23 return 23 return
24 end 24 end
25 end 25 end
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @8e8f967
@@ -474,7 +474,7 @@ class ContentViewerControllerTest < ActionController::TestCase @@ -474,7 +474,7 @@ class ContentViewerControllerTest < ActionController::TestCase
474 get :view_page, :profile => p.identifier, :page => old_path 474 get :view_page, :profile => p.identifier, :page => old_path
475 475
476 assert_response :redirect 476 assert_response :redirect
477 - assert_redirected_to :profile => p.identifier, :page => a.explode_path 477 + assert_redirected_to :host => p.default_hostname, :controller => 'content_viewer', :action => 'view_page', :profile => p.identifier, :page => a.explode_path
478 end 478 end
479 479
480 should 'load new article name equal of another article old name' do 480 should 'load new article name equal of another article old name' do
@@ -503,7 +503,7 @@ class ContentViewerControllerTest < ActionController::TestCase @@ -503,7 +503,7 @@ class ContentViewerControllerTest < ActionController::TestCase
503 get :view_page, :profile => p.identifier, :page => old_path 503 get :view_page, :profile => p.identifier, :page => old_path
504 504
505 assert_response :redirect 505 assert_response :redirect
506 - assert_redirected_to :profile => p.identifier, :page => a2.explode_path 506 + assert_redirected_to :host => p.default_hostname, :controller => 'content_viewer', :action => 'view_page', :profile => p.identifier, :page => a2.explode_path
507 end 507 end
508 508
509 should 'not return an article of a different user' do 509 should 'not return an article of a different user' do