From 358d4a53b87db9101ea06a10cb0aa5176b4b6a7a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 23 Jun 2014 14:19:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E5=85=AC=E5=BC=80?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E4=BB=8D=E5=9C=A8=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5=E6=9C=80=E6=96=B0=E5=8A=A8=E6=80=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/welcome_helper.rb   |  2 +-
 lib/redmine/activity/fetcher.rb | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
index 003c6f288..35fd6ee08 100644
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -333,7 +333,7 @@ module WelcomeHelper
   end
 
   #取得所有活动
-  def find_all_activities limit=6
+  def   find_all_activities limit=6
     # users = []
     # activities = Activity.find_by_sql("select distinct user_id from activities order by id DESC limit #{limit}" )
     # activities.each { |activity|
diff --git a/lib/redmine/activity/fetcher.rb b/lib/redmine/activity/fetcher.rb
index 6ea8c3258..a05a9ee17 100644
--- a/lib/redmine/activity/fetcher.rb
+++ b/lib/redmine/activity/fetcher.rb
@@ -88,10 +88,21 @@ module Redmine
       def events_welcome(from = nil, to = nil, options={})
         e = []
         @options[:limit] = options[:limit]
-
         @scope.each do |event_type|
           constantized_providers(event_type).each do |provider|
-            e += provider.find_events1(event_type, @user, from, to, @options)
+            cur_objs = provider.find_events1(event_type, @user, from, to, @options)
+            cur_objs.each do |cur_obj|
+              if cur_obj.class == Issue
+                if cur_obj.project != nil && cur_obj.project.project_status != nil
+                  e += [cur_obj]
+                end
+              else
+                e += [cur_obj]
+              end
+            end
+          end
+          if e.count > options[:limit]
+            break
           end
         end