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
This commit is contained in:
parent
e02da72947
commit
8bc0f7888b
|
@ -26,7 +26,7 @@ class NewsController < ApplicationController
|
||||||
def index
|
def index
|
||||||
@news_pages, @newss = paginate :news,
|
@news_pages, @newss = paginate :news,
|
||||||
:per_page => 10,
|
: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],
|
:include => [:author, :project],
|
||||||
:order => "#{News.table_name}.created_on DESC"
|
:order => "#{News.table_name}.created_on DESC"
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
|
|
Loading…
Reference in New Issue