Download as
Browse Code »

Commit 8c112a4a7bbb72f5f060acc29b86a323849a2a48

Authored by Joenio Costa
Committed by Antonio Terceiro
1 parent 22538ba2
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

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,8 +13,7 @@ class ContentViewerController < ApplicationController
13 if path.blank? 13 if path.blank?
14 @page = profile.home_page 14 @page = profile.home_page
15 if @page.nil? 15 if @page.nil?
16 - @tags = profile.tags  
17 - render :template => 'profile/index' 16 + redirect_to :controller => 'profile', :action => 'index', :profile => profile.identifier
18 return 17 return
19 end 18 end
20 else 19 else
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @8c112a4
@@ -816,10 +816,10 @@ class ContentViewerControllerTest < Test::Unit::TestCase @@ -816,10 +816,10 @@ class ContentViewerControllerTest < Test::Unit::TestCase
816 assert_no_tag :tag => 'div', :attributes => { :id => 'article-source' } 816 assert_no_tag :tag => 'div', :attributes => { :id => 'article-source' }
817 end 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 profile.home_page.destroy 820 profile.home_page.destroy
821 get :view_page, :profile => profile.identifier, :page => [] 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 end 823 end
824 824
825 should "not display 'Upload files' when viewing blog" do 825 should "not display 'Upload files' when viewing blog" do