Download as
Browse Code »

Commit 3ffe1796e20643e7c19ff638970724cd55c08896

Authored by Braulio Bhavamitra
1 parent 47b2e79b
Exists in staging and in 39 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, user_mention, webfinger_server

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,9 +3,10 @@
3 Rails.configuration.to_prepare do 3 Rails.configuration.to_prepare do
4 ActionTracker::Record.module_eval do 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 def conditions_for_comments 11 def conditions_for_comments
11 type, id = (self.target_type == 'Article' ? ['Article', self.target_id] : [self.class.to_s, self.id]) 12 type, id = (self.target_type == 'Article' ? ['Article', self.target_id] : [self.class.to_s, self.id])