@@ -1,5 +1,5 @@ module PitchesHelper def citizen_supporters_for(pitch) - pitch.supporters - pitch.donations.from_organizations.map(&:user) + pitch.supporters - pitch.donations_and_credits.from_organizations.map(&:user) end end app/helpers/pitches_helper.rb @@ -103,7 +103,7 @@ class Pitch < NewsItem end end has_many :donations_and_credits, :class_name => "Donation" - has_many :organizational_donors, :through => :donations, :source => :user, :order => "donations.created_at", + has_many :organizational_donors, :through => :donations_and_credits, :source => :user, :order => "donations.created_at", :conditions => "users.type = 'organization'", :uniq => true app/models/pitch.rb @@ -1,4 +1,4 @@ -- if news_item.supporting_organizations.any? || news_item.donations.from_organizations.any? +- if news_item.supporting_organizations.any? || news_item.donations_and_credits.from_organizations.any? .organizational_support %h2.supporters Organizational Support .double_content_border app/views/news_items/_organizational_supporters.html.haml 5c578c546faa3e500b7242c5fb412fcccf662b93 Dan Newman dpnewman@gmail.com http://github.com/spot-us/spot-us/commit/abcb786ee0f7776d4feffdc835a194d52e99eeb1 abcb786ee0f7776d4feffdc835a194d52e99eeb1 2009-11-06T13:01:17-08:00 2009-11-06T13:01:17-08:00 segmenting credits between org donors and supporters a068c7b4e12f51e02347d090f5eb7d4b6d6be6bf Dan Newman dpnewman@gmail.com