Download as
Browse Code »

Commit 8c112a4a7bbb72f5f060acc29b86a323849a2a48

Authored by Joenio Costa
Committed by Antonio Terceiro
1 parent 22538ba2
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

ActionItem1239: crash while viewing community

Showing 2 changed files with 3 additions and 4 deletions   Show diff stats
app/controllers/public/content_viewer_controller.rb
  Diff comments   View file @8c112a4
... ... @@ -13,8 +13,7 @@ class ContentViewerController < ApplicationController
13 13 if path.blank?
14 14 @page = profile.home_page
15 15 if @page.nil?
16   - @tags = profile.tags
17   - render :template => 'profile/index'
  16 + redirect_to :controller => 'profile', :action => 'index', :profile => profile.identifier
18 17 return
19 18 end
20 19 else
... ...
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @8c112a4
... ... @@ -816,10 +816,10 @@ class ContentViewerControllerTest < Test::Unit::TestCase
816 816 assert_no_tag :tag => 'div', :attributes => { :id => 'article-source' }
817 817 end
818 818  
819   - should 'render profile screen when there is no homepage' do
  819 + should 'redirect to profile controller when there is no homepage' do
820 820 profile.home_page.destroy
821 821 get :view_page, :profile => profile.identifier, :page => []
822   - assert_template 'profile/index'
  822 + assert_redirected_to :controller => 'profile', :action => 'index', :profile => profile.identifier
823 823 end
824 824  
825 825 should "not display 'Upload files' when viewing blog" do
... ...