Download as
Browse Code »

Commit 34402f44ddf33839551b25ab6677708e941801d7

Authored by Braulio Bhavamitra
1 parent 9d9f94ae
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

Fix ambiguous field on query

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @34402f4
@@ -103,7 +103,7 @@ class Article < ActiveRecord::Base @@ -103,7 +103,7 @@ class Article < ActiveRecord::Base
103 103
104 named_scope :by_range, lambda { |range| { 104 named_scope :by_range, lambda { |range| {
105 :conditions => [ 105 :conditions => [
106 - 'published_at BETWEEN :start_date AND :end_date', { :start_date => range.first, :end_date => range.last } 106 + 'articles.published_at BETWEEN :start_date AND :end_date', { :start_date => range.first, :end_date => range.last }
107 ] 107 ]
108 }} 108 }}
109 109
@@ -324,7 +324,7 @@ class Article < ActiveRecord::Base @@ -324,7 +324,7 @@ class Article < ActiveRecord::Base
324 def belongs_to_blog? 324 def belongs_to_blog?
325 self.parent and self.parent.blog? 325 self.parent and self.parent.blog?
326 end 326 end
327 - 327 +
328 def belongs_to_forum? 328 def belongs_to_forum?
329 self.parent and self.parent.forum? 329 self.parent and self.parent.forum?
330 end 330 end