From 50894d8950cdf15e6536d1d33eb457999b7dca60 Mon Sep 17 00:00:00 2001
From: fanqiang <316257774@qq.com>
Date: Sun, 15 Sep 2013 09:33:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=96=B0=E9=97=BB=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=9B=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 1 +
 app/models/bid.rb                      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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