jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修复项目首页的用户动态会显示私有项目中的动态的BUG

This commit is contained in:
sw 2014-10-10 13:52:33 +08:00
parent 2e3ff531f6
commit 0f492047a5
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/helpers/welcome_helper.rb
View File

@ -405,7 +405,8 @@ module WelcomeHelper
"show_bids" => true,
"show_contest" => true
}
activity.scope_select{|t| ['changesets', 'documents', 'memos', 'messages', 'journals_for_messages', 'bids', 'news', 'contestnotification'].include?(t) ? nil : 'You may think you know what the following code does, may be. but why don"t you close this file and go play with something else, Now?' }
activity.scope_select{|t| ['changesets', 'documents', 'memos', 'messages', 'journals_for_messages', 'bids', 'news', 'contestnotification'].include?(t) ?
nil : 'You may think you know what the following code does, may be. but why don"t you close this file and go play with something else, Now?' }
activity.events_welcome(nil, nil, {:limit => limit, :types => 'welcome'})
end

15
lib/redmine/activity/fetcher.rb
View File

@ -109,12 +109,17 @@ module Redmine
end
if cur_objs
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
#if cur_obj.class.to_s == 'Issue'
# if cur_obj.project != nil && cur_obj.project.project_status != nil && cur_obj.project.is_public == 1
# e += [cur_obj]
# end
#else
# e += [cur_obj]
#end
if cur_obj.project != nil && cur_obj.project.project_status != nil && cur_obj.project.is_public == true
e += [cur_obj]
#else
# e += [cur_obj]
end
end
end