Download as
Browse Code »

Commit ebdbd8ac957ea2876dad91813d1672afba023ce7

Authored by Daniela Feitosa
1 parent ffbf0914
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

Removed unused method 

It's not used anymore since:
ca5ebf95375cd5dbb80a047dc79f4c31e36df899
Showing 2 changed files with 1 additions and 18 deletions   Show diff stats
test/unit/comment_test.rb
  Diff comments   View file @ebdbd8a
... ... @@ -293,7 +293,7 @@ class CommentTest < ActiveSupport::TestCase
293 293 c2 = Comment.create!(:reply_of_id => c1.id, :source => a, :body => 'bla', :author => person)
294 294 c3 = Comment.create!(:reply_of_id => c0.id, :source => a, :body => 'bla', :author => person)
295 295 c4 = Comment.create!(:source => a, :body => 'My comment', :author => person)
296   - result = a.activity.comments_as_thread
  296 + result = a.activity.comments
297 297 assert_equal c0, result[0]
298 298 assert_equal [c1, c3], result[0].replies
299 299 assert_equal [c2], result[0].replies[0].replies
... ...
vendor/plugins/action_tracker_has_comments/init.rb
  Diff comments   View file @ebdbd8a
... ... @@ -12,22 +12,5 @@ Rails.configuration.to_prepare do
12 12 "source_type = '#{type}' AND source_id = '#{id}' AND spam IS NOT TRUE AND reply_of_id IS NULL"
13 13 end
14 14  
15   - def comments_as_thread
16   - result = {}
17   - root = []
18   - self.comments.each do |c|
19   - c.replies = []
20   - result[c.id] ||= c
21   - if c.reply_of_id.nil?
22   - root << c
23   - elsif result[c.reply_of_id]
24   - result[c.reply_of_id].replies << c
25   - else # Comment is a reply but the reply is not being displayed - is spam, for example
26   - root << c
27   - end
28   - end
29   - root
30   - end
31   -
32 15 end
33 16 end
... ...