diff app/views/my/blocks/_news.html.erb @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author Chris Cannam
date Fri, 14 Jun 2013 09:28:30 +0100
parents 622f24f53b42
children
line wrap: on
line diff
--- a/app/views/my/blocks/_news.html.erb	Fri Jun 14 09:07:32 2013 +0100
+++ b/app/views/my/blocks/_news.html.erb	Fri Jun 14 09:28:30 2013 +0100
@@ -1,8 +1,3 @@
 <h3><%=l(:label_news_latest)%></h3>
 
-<%= render(:partial => 'news/news',
-            :collection => News.find(:all,
-                                     :limit => 10,
-                                     :order => "#{News.table_name}.created_on DESC",
-                                     :conditions => "#{News.table_name}.project_id in (#{@user.projects.collect{|m| m.id}.join(',')})",
-                                     :include => [:project, :author])) unless @user.projects.empty? %>
+<%= render :partial => 'news/news', :collection => news_items %>