Download as
Browse Code »

Commit 3ffe1796e20643e7c19ff638970724cd55c08896

Authored by Braulio Bhavamitra
1 parent 47b2e79b
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.1: temporaraly removed :finder_sql as it is not supported anymore 

Fix this later, now we need to boot the app
Showing 1 changed file with 4 additions and 3 deletions   Show diff stats
vendor/plugins/action_tracker_has_comments/init.rb
  Diff comments   View file @3ffe179
... ... @@ -3,9 +3,10 @@
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   - :finder_sql => Proc.new { %Q{SELECT * FROM comments WHERE #{conditions_for_comments} ORDER BY created_at ASC}},
8   - :counter_sql => Proc.new { %Q{SELECT COUNT(*) FROM comments WHERE #{conditions_for_comments}} }
  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}} }
9 10  
10 11 def conditions_for_comments
11 12 type, id = (self.target_type == 'Article' ? ['Article', self.target_id] : [self.class.to_s, self.id])
... ...