From: Toshi MARUYAMA Date: Thu, 1 Sep 2011 10:45:06 +0000 (+0000) Subject: rename .rhtml to .html.erb of app/views/my/blocks/_documents.rhtml. X-Git-Tag: 1.3.0~993 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=231428516e279430136217f6eae01d15d80bfcbf;p=redmine.git rename .rhtml to .html.erb of app/views/my/blocks/_documents.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@6970 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/my/blocks/_documents.html.erb b/app/views/my/blocks/_documents.html.erb new file mode 100644 index 000000000..d222e4203 --- /dev/null +++ b/app/views/my/blocks/_documents.html.erb @@ -0,0 +1,9 @@ +

<%=l(:label_document_plural)%>

+ +<% project_ids = @user.projects.select {|p| @user.allowed_to?(:view_documents, p)}.collect(&:id) %> +<%= render(:partial => 'documents/document', + :collection => Document.find(:all, + :limit => 10, + :order => "#{Document.table_name}.created_on DESC", + :conditions => "#{Document.table_name}.project_id in (#{project_ids.join(',')})", + :include => [:project])) unless project_ids.empty? %> \ No newline at end of file diff --git a/app/views/my/blocks/_documents.rhtml b/app/views/my/blocks/_documents.rhtml deleted file mode 100644 index d222e4203..000000000 --- a/app/views/my/blocks/_documents.rhtml +++ /dev/null @@ -1,9 +0,0 @@ -

<%=l(:label_document_plural)%>

- -<% project_ids = @user.projects.select {|p| @user.allowed_to?(:view_documents, p)}.collect(&:id) %> -<%= render(:partial => 'documents/document', - :collection => Document.find(:all, - :limit => 10, - :order => "#{Document.table_name}.created_on DESC", - :conditions => "#{Document.table_name}.project_id in (#{project_ids.join(',')})", - :include => [:project])) unless project_ids.empty? %> \ No newline at end of file