Download as
Browse Code »

Commit bf73d4eabdc000b58b7d2fe9ba00801abb2a538a

Authored by Victor Costa
2 parents 70455745 21d8e227
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'hotfixes' into stable

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
plugins/community_track/lib/community_track_plugin.rb
  Diff comments   View file @bf73d4e
@@ -13,8 +13,7 @@ class CommunityTrackPlugin < Noosfero::Plugin @@ -13,8 +13,7 @@ class CommunityTrackPlugin < Noosfero::Plugin
13 end 13 end
14 14
15 def content_types 15 def content_types
16 - return [] if !context.kind_of?(CmsController)  
17 - if context.respond_to?(:params) && context.params 16 + if context.kind_of?(CmsController) && context.respond_to?(:params) && context.params
18 types = [] 17 types = []
19 parent_id = context.params[:parent_id] 18 parent_id = context.params[:parent_id]
20 types << CommunityTrackPlugin::Track if context.profile.community? && !parent_id 19 types << CommunityTrackPlugin::Track if context.profile.community? && !parent_id
plugins/community_track/test/unit/community_track_plugin_test.rb
  Diff comments   View file @bf73d4e
@@ -7,6 +7,7 @@ class CommunityTrackPluginTest &lt; ActiveSupport::TestCase @@ -7,6 +7,7 @@ class CommunityTrackPluginTest &lt; ActiveSupport::TestCase
7 @profile = fast_create(Community) 7 @profile = fast_create(Community)
8 @params = {} 8 @params = {}
9 @context = mock 9 @context = mock
  10 + @context.stubs(:kind_of?).returns(CmsController)
10 @context.stubs(:profile).returns(@profile) 11 @context.stubs(:profile).returns(@profile)
11 @context.stubs(:params).returns(@params) 12 @context.stubs(:params).returns(@params)
12 @plugin.stubs(:context).returns(@context) 13 @plugin.stubs(:context).returns(@context)