Download as
Browse Code »

Commit f87e72da28b62c08d8176466459197aec5cb4adc

Authored by Victor Costa
1 parent a3c0f6f0
Exists in staging and in 4 other branches captcha_serpro_plugin, login-captcha, production, production-vendorized

proposals_discussion: fix ambiguous problem on article

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @f87e72d
@@ -237,7 +237,7 @@ class Article < ActiveRecord::Base @@ -237,7 +237,7 @@ class Article < ActiveRecord::Base
237 } 237 }
238 238
239 scope :public, 239 scope :public,
240 - :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ], :joins => [:profile] 240 + :conditions => [ "articles.advertise = ? AND articles.published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ], :joins => [:profile]
241 241
242 scope :more_recent, 242 scope :more_recent,
243 :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND 243 :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND