diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 981808017..81e9f5e3c 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -450,6 +450,7 @@ class ProjectsController < ApplicationController "show_files" => true, "show_documents" => true, "show_messages" => true, + "show_news" => true, "show_bids" => true } @date_to ||= Date.today + 1 diff --git a/app/models/bid.rb b/app/models/bid.rb index 5bfde4c87..bb254b6dc 100644 --- a/app/models/bid.rb +++ b/app/models/bid.rb @@ -51,7 +51,7 @@ class Bid < ActiveRecord::Base :author => :author, :url => Proc.new {|o| {:controller => 'bids', :action => 'show', :id => o.id}} - acts_as_activity_provider :find_options => {:include => [:project, :author]}, + acts_as_activity_provider :find_options => {:include => [:projects, :author]}, :author_key => :author_id