diff .svn/pristine/2c/2c76b08002398b97784edeca2011d8a77c453847.svn-base @ 927:9ee5fd0b9bd3

Merge from cannam_integration
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Fri, 11 May 2012 16:13:59 +0100
parents cbb26bc654de
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/2c/2c76b08002398b97784edeca2011d8a77c453847.svn-base	Fri May 11 16:13:59 2012 +0100
@@ -0,0 +1,8 @@
+<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? %>