From: Toshi MARUYAMA Date: Thu, 1 Sep 2011 10:48:12 +0000 (+0000) Subject: rename .rhtml to .html.erb of app/views/my/blocks/_news.rhtml. X-Git-Tag: 1.3.0~989 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9a50e49cc94c1db80926df5b2de96b99219e398b;p=redmine.git rename .rhtml to .html.erb of app/views/my/blocks/_news.rhtml. :rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6974 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/my/blocks/_news.html.erb b/app/views/my/blocks/_news.html.erb new file mode 100644 index 000000000..d86cced92 --- /dev/null +++ b/app/views/my/blocks/_news.html.erb @@ -0,0 +1,8 @@ +

<%=l(:label_news_latest)%>

+ +<%= 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? %> \ No newline at end of file diff --git a/app/views/my/blocks/_news.rhtml b/app/views/my/blocks/_news.rhtml deleted file mode 100644 index d86cced92..000000000 --- a/app/views/my/blocks/_news.rhtml +++ /dev/null @@ -1,8 +0,0 @@ -

<%=l(:label_news_latest)%>

- -<%= 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? %> \ No newline at end of file