Download as
Browse Code »

Commit dbd6c201d9ae21a35cf878ee83a6dadfab43e0ce

Authored by Victor Costa
1 parent 0770524c
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

accept lambda in comment_actions hot spot

Showing 3 changed files with 14 additions and 2 deletions   Show diff stats
app/helpers/comment_helper.rb
  Diff comments   View file @dbd6c20
@@ -31,7 +31,10 @@ module CommentHelper @@ -31,7 +31,10 @@ module CommentHelper
31 31
32 def links_for_comment_actions(comment) 32 def links_for_comment_actions(comment)
33 actions = [link_for_report_abuse(comment), link_for_spam(comment), link_for_edit(comment), link_for_remove(comment)] 33 actions = [link_for_report_abuse(comment), link_for_spam(comment), link_for_edit(comment), link_for_remove(comment)]
34 - actions += @plugins.dispatch(:comment_actions, comment) 34 + @plugins.dispatch(:comment_actions, comment).collect do |action|
  35 + actions << (action.kind_of?(Proc) ? self.instance_eval(&action) : action)
  36 + end
  37 + actions.flatten
35 end 38 end
36 39
37 def link_for_report_abuse(comment) 40 def link_for_report_abuse(comment)
lib/noosfero/plugin.rb
  Diff comments   View file @dbd6c20
@@ -278,7 +278,7 @@ class Noosfero::Plugin @@ -278,7 +278,7 @@ class Noosfero::Plugin
278 end 278 end
279 279
280 # Adds extra actions for comments 280 # Adds extra actions for comments
281 - # 281 + # returns = list of hashes or lambda block that creates a list of hashes
282 # example: 282 # example:
283 # 283 #
284 # def comment_actions(comment) 284 # def comment_actions(comment)
test/unit/comment_helper_test.rb
  Diff comments   View file @dbd6c20
@@ -37,6 +37,15 @@ class CommentHelperTest &lt; ActiveSupport::TestCase @@ -37,6 +37,15 @@ class CommentHelperTest &lt; ActiveSupport::TestCase
37 links = links_for_comment_actions(comment) 37 links = links_for_comment_actions(comment)
38 assert_includes links, plugin_action 38 assert_includes links, plugin_action
39 end 39 end
  40 +
  41 + should 'include lambda actions of plugins in menu' do
  42 + comment = Comment.new
  43 + plugin_action = lambda{[{:link => 'plugin_action'}, {:link => 'plugin_action2'}]}
  44 + @plugins.stubs(:dispatch).returns([plugin_action])
  45 + links = links_for_comment_actions(comment)
  46 + assert_includes links, {:link => 'plugin_action'}
  47 + assert_includes links, {:link => 'plugin_action2'}
  48 + end
40 49
41 should 'return link for report abuse action when comment has a author' do 50 should 'return link for report abuse action when comment has a author' do
42 comment = Comment.new 51 comment = Comment.new