Download as
Browse Code »

Commit 5167646409d9f13eafacc8494aa7ea79149bf564

Authored by Leandro Santos
1 parent 13239c9a
Exists in staging and in 29 other branches all_pending_tasks_api, api_roles, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, follower_permition, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, profile_api_improvements, user_mention

avoid exception in recent content block used in environment without portal community defined

Showing 2 changed files with 12 additions and 1 deletions   Show diff stats
plugins/recent_content/lib/recent_content_block.rb
  Diff comments   View file @5167646
... ... @@ -33,7 +33,7 @@ class RecentContentBlock < Block
33 33 end
34 34  
35 35 def parents
36   - self.holder.articles.where(type: 'Blog')
  36 + self.holder.nil? ? [] : self.holder.articles.where(type: 'Blog')
37 37 end
38 38  
39 39 def root
... ...
plugins/recent_content/test/unit/recent_content_block_test.rb
  Diff comments   View file @5167646
... ... @@ -156,4 +156,15 @@ class RecentContentBlockViewTest < ActionView::TestCase
156 156 assert_equal [article.id], block.api_content['articles'].map {|a| a[:id]}
157 157 end
158 158  
  159 + should 'parents return an empty array for environment without portal community' do
  160 + environment = fast_create(Environment)
  161 + block = RecentContentBlock.new
  162 + box = mock()
  163 + block.stubs(:box).returns(box)
  164 + box.stubs(:owner).returns(environment)
  165 +
  166 + assert_nil environment.portal_community
  167 + assert_equal [], block.parents
  168 + end
  169 +
159 170 end
... ...