config/email.yml.example deploy/before_restart.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 @@ -69,9 +69,9 @@ .block-spacer-negative = publishing_workflow_buttons_for(current_user) .span-160.box_white - = render :partial => "news_items/organizational_supporters", :locals => {:news_item => @story} - = render :partial => "pitches/group_supporters", :locals => {:news_item => @story} - = render :partial => "pitches/supporters", :locals => {:news_item => @story} + = render :partial => "news_items/organizational_supporters", :locals => {:news_item => @story.pitch} + = render :partial => "pitches/group_supporters", :locals => {:news_item => @story.pitch} + = render :partial => "pitches/supporters", :locals => {:news_item => @story.pitch} .clear .block-spacer app/views/stories/show.html.haml @@ -34,4 +34,4 @@ config.to_prepare do end PAYPAL_POST_URL = "https://www.sandbox.paypal.com/cgi-bin/webscr" -PAYPAL_EMAIL = "info+s_1240233800_per@spot.us" +PAYPAL_EMAIL = "info+s_1240233800_per@spot.us" \ No newline at end of file config/environments/development.rb @@ -18,4 +18,4 @@ config.after_initialize do }) end PAYPAL_POST_URL = "https://www.paypal.com/cgi-bin/webscr" -PAYPAL_EMAIL = "info@spot.us" +PAYPAL_EMAIL = "info@spot.us" \ No newline at end of file config/environments/production.rb @@ -21,4 +21,4 @@ config.to_prepare do end PAYPAL_POST_URL = "https://www.sandbox.paypal.com/cgi-bin/webscr" -PAYPAL_EMAIL = "info+s_1240233800_per@spot.us" +PAYPAL_EMAIL = "info+s_1240233800_per@spot.us" \ No newline at end of file config/environments/staging.rb @@ -14,7 +14,7 @@ development: canvas_page_name: callback_url: http://localhost:3000/ pretty_errors: true - set_asset_host_to_callback_url: true + set_asset_host_to_callback_url: false tunnel: public_host_username: public_host: @@ -27,7 +27,7 @@ test: secret_key: canvas_page_name: callback_url: - set_asset_host_to_callback_url: true + set_asset_host_to_callback_url: false tunnel: public_host_username: public_host: @@ -40,7 +40,7 @@ staging: secret_key: c5fb41d223c153e2347560827d6bc82d canvas_page_name: callback_url: http://spotus.hrvab.com/ - set_asset_host_to_callback_url: true + set_asset_host_to_callback_url: false tunnel: public_host_username: public_host: @@ -53,7 +53,7 @@ production: secret_key: 4bcf802601b9a428b96654ebfd631aba canvas_page_name: callback_url: http://spot.us/ - set_asset_host_to_callback_url: true + set_asset_host_to_callback_url: false tunnel: public_host_username: public_host: config/facebooker.yml 7d7c692cca21de1294fac495762b5064f82c826f 629c00b7fb3a3e82cb52ca4eae1f7484ea12274e Dan Newman dpnewman@gmail.com http://github.com/spot-us/spot-us/commit/b905d4fef0b03161dbe45c673d6a6dd70b6d3e79 b905d4fef0b03161dbe45c673d6a6dd70b6d3e79 2009-11-09T18:01:59-08:00 2009-11-09T18:01:59-08:00 Merged S3 and recent changes d3e1aa935477dfb13fce98c01933f1d0b541b475 Dan Newman dpnewman@gmail.com