From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 3 Dec 2009 21:16:08 +0000 (+0000)
Subject: Fixed: News from a project with 'news' module disabled, are still diplayed in the... 
X-Git-Tag: 0.9.0~142
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8bc0f7888bdddf452bbaa97c86e22b6ebc0aac58;p=redmine.git

Fixed: News from a project with 'news' module disabled, are still diplayed in the cross-project news list (#4333).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3120 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 68d2b2a8b..394b5182e 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -26,7 +26,7 @@ class NewsController < ApplicationController
   def index
     @news_pages, @newss = paginate :news,
                                    :per_page => 10,
-                                   :conditions => (@project ? {:project_id => @project.id} : Project.visible_by(User.current)),
+                                   :conditions => Project.allowed_to_condition(User.current, :view_news, :project => @project),
                                    :include => [:author, :project],
                                    :order => "#{News.table_name}.created_on DESC"    
     respond_to do |format|