Download as
Browse Code »

Commit 2f568c12b69978d5609bdcbfd7bd4ff98f2f51f7

Authored by Braulio Bhavamitra
1 parent 5d783a7e
Exists in master and in 20 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, 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, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails4: port comments on action_tracker

Showing 2 changed files with 6 additions and 9 deletions   Show diff stats
test/unit/comment_test.rb
  Diff comments   View file @2f568c1
... ... @@ -294,6 +294,7 @@ class CommentTest < ActiveSupport::TestCase
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 296 result = a.activity.comments
  297 + assert result.present?
297 298 assert_equal c0, result[0]
298 299 assert_equal [c1, c3], result[0].replies
299 300 assert_equal [c2], result[0].replies[0].replies
... ...
vendor/plugins/action_tracker_has_comments/init.rb
  Diff comments   View file @2f568c1
... ... @@ -3,15 +3,11 @@
3 3 Rails.configuration.to_prepare do
4 4 ActionTracker::Record.module_eval do
5 5  
6   - has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy
7   - #FIXME rails 4.1 removes finder_sql
8   - #:finder_sql => Proc.new { %Q{SELECT * FROM comments WHERE #{conditions_for_comments} ORDER BY created_at ASC}},
9   - #:counter_sql => Proc.new { %Q{SELECT COUNT(*) FROM comments WHERE #{conditions_for_comments}} }
10   -
11   - def conditions_for_comments
12   - type, id = (self.target_type == 'Article' ? ['Article', self.target_id] : [self.class.to_s, self.id])
13   - "source_type = '#{type}' AND source_id = '#{id}' AND spam IS NOT TRUE AND reply_of_id IS NULL"
  6 + def comments
  7 + type, id = if self.target_type == 'Article' then ['Article', self.target_id] else [self.class.to_s, self.id] end
  8 + Comment.order('created_at ASC').
  9 + where('comments.spam IS NOT TRUE AND comments.reply_of_id IS NULL').
  10 + where('source_type = ? AND source_id = ?', type, id)
14 11 end
15   -
16 12 end
17 13 end
... ...