Download as
Browse Code »

Commit dbd6c201d9ae21a35cf878ee83a6dadfab43e0ce

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

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 31  
32 32 def links_for_comment_actions(comment)
33 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 38 end
36 39  
37 40 def link_for_report_abuse(comment)
... ...
lib/noosfero/plugin.rb
  Diff comments   View file @dbd6c20
... ... @@ -278,7 +278,7 @@ class Noosfero::Plugin
278 278 end
279 279  
280 280 # Adds extra actions for comments
281   - #
  281 + # returns = list of hashes or lambda block that creates a list of hashes
282 282 # example:
283 283 #
284 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 37 links = links_for_comment_actions(comment)
38 38 assert_includes links, plugin_action
39 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 50 should 'return link for report abuse action when comment has a author' do
42 51 comment = Comment.new
... ...