Download as
Browse Code »

Commit fdaee4f48def6a61aacb5e74b5c72981d65bb4cd

Authored by Victor Costa
1 parent dbd6c201
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

do not show comment actions menu if it has no items

Showing 2 changed files with 11 additions and 1 deletions   Show diff stats
app/helpers/comment_helper.rb
  Diff comments   View file @fdaee4f
... ... @@ -34,7 +34,7 @@ module CommentHelper
34 34 @plugins.dispatch(:comment_actions, comment).collect do |action|
35 35 actions << (action.kind_of?(Proc) ? self.instance_eval(&action) : action)
36 36 end
37   - actions.flatten
  37 + actions.flatten.compact
38 38 end
39 39  
40 40 def link_for_report_abuse(comment)
... ...
test/unit/comment_helper_test.rb
  Diff comments   View file @fdaee4f
... ... @@ -29,6 +29,16 @@ class CommentHelperTest &lt; ActiveSupport::TestCase
29 29 menu = comment_actions(comment)
30 30 assert !menu
31 31 end
  32 +
  33 + should 'do not show menu if it has nil actions only' do
  34 + comment = Comment.new
  35 + self.stubs(:link_for_report_abuse).returns(nil)
  36 + self.stubs(:link_for_spam).returns(nil)
  37 + self.stubs(:link_for_edit).returns(nil)
  38 + self.stubs(:link_for_remove).returns(nil)
  39 + menu = comment_actions(comment)
  40 + assert !menu
  41 + end
32 42  
33 43 should 'include actions of plugins in menu' do
34 44 comment = Comment.new
... ...