From f87e72da28b62c08d8176466459197aec5cb4adc Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Wed, 6 Aug 2014 13:55:48 -0300 Subject: [PATCH] proposals_discussion: fix ambiguous problem on article --- app/models/article.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/article.rb b/app/models/article.rb index 49ce5f4..f62e2db 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -237,7 +237,7 @@ class Article < ActiveRecord::Base } scope :public, - :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ], :joins => [:profile] + :conditions => [ "articles.advertise = ? AND articles.published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ], :joins => [:profile] scope :more_recent, :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND -- libgit2 0.21.2