Download as
Browse Code »

Commit fdaee4f48def6a61aacb5e74b5c72981d65bb4cd

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

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,7 +34,7 @@ module CommentHelper
34 @plugins.dispatch(:comment_actions, comment).collect do |action| 34 @plugins.dispatch(:comment_actions, comment).collect do |action|
35 actions << (action.kind_of?(Proc) ? self.instance_eval(&action) : action) 35 actions << (action.kind_of?(Proc) ? self.instance_eval(&action) : action)
36 end 36 end
37 - actions.flatten 37 + actions.flatten.compact
38 end 38 end
39 39
40 def link_for_report_abuse(comment) 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,6 +29,16 @@ class CommentHelperTest &lt; ActiveSupport::TestCase
29 menu = comment_actions(comment) 29 menu = comment_actions(comment)
30 assert !menu 30 assert !menu
31 end 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 should 'include actions of plugins in menu' do 43 should 'include actions of plugins in menu' do
34 comment = Comment.new 44 comment = Comment.new