Download as
Browse Code »

Commit aa2c4349df0f1075885b28f5880603f508205c86

Authored by Victor Costa
1 parent 45813640
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

comment_paragraph: apply macro only for content viewer controller

Showing 2 changed files with 18 additions and 2 deletions   Show diff stats
plugins/comment_paragraph/lib/comment_paragraph_plugin/macros/allow_comment.rb
  Diff comments   View file @aa2c434
... ... @@ -12,8 +12,12 @@ class CommentParagraphPlugin::AllowComment < Noosfero::Plugin::Macro
12 12 count = article.paragraph_comments.without_spam.in_paragraph(paragraph_uuid).count
13 13  
14 14 proc {
15   - render :partial => 'comment_paragraph_plugin_profile/comment_paragraph',
16   - :locals => {:paragraph_uuid => paragraph_uuid, :article_id => article.id, :inner_html => inner_html, :count => count, :profile_identifier => article.profile.identifier }
  15 + if controller.kind_of?(ContentViewerController)
  16 + render :partial => 'comment_paragraph_plugin_profile/comment_paragraph',
  17 + :locals => {:paragraph_uuid => paragraph_uuid, :article_id => article.id, :inner_html => inner_html, :count => count, :profile_identifier => article.profile.identifier }
  18 + else
  19 + inner_html
  20 + end
17 21 }
18 22 end
19 23 end
... ...
plugins/comment_paragraph/test/unit/allow_comment_test.rb
  Diff comments   View file @aa2c434
... ... @@ -18,9 +18,21 @@ class AllowCommentTest < ActiveSupport::TestCase
18 18 comment = fast_create(Comment, :paragraph_uuid => 1, :source_id => article.id)
19 19 inner_html = 'inner'
20 20 content = macro.parse({:paragraph_uuid => comment.paragraph_uuid}, inner_html, article)
  21 + expects(:controller).returns(ContentViewerController.new)
21 22  
22 23 expects(:render).with({:partial => 'comment_paragraph_plugin_profile/comment_paragraph', :locals => {:paragraph_uuid => comment.paragraph_uuid, :article_id => article.id, :inner_html => inner_html, :count => 1, :profile_identifier => profile.identifier} })
23 24 instance_eval(&content)
24 25 end
25 26  
  27 + should 'not parse contents outside content viewer controller' do
  28 + profile = fast_create(Community)
  29 + article = fast_create(Article, :profile_id => profile.id)
  30 + comment = fast_create(Comment, :paragraph_uuid => 1, :source_id => article.id)
  31 + inner_html = 'inner'
  32 + content = macro.parse({:paragraph_uuid => comment.paragraph_uuid}, inner_html, article)
  33 + expects(:controller).returns(HomeController.new)
  34 +
  35 + assert_equal 'inner', instance_eval(&content)
  36 + end
  37 +
26 38 end
... ...