From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 1 Sep 2011 10:46:33 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/my/blocks/_calendar.rhtml.
X-Git-Tag: 1.3.0~991
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=22bb56cb5dc9514816aab533e64282d460ad2497;p=redmine.git

rename .rhtml to .html.erb of app/views/my/blocks/_calendar.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@6972 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/my/blocks/_calendar.html.erb b/app/views/my/blocks/_calendar.html.erb
new file mode 100644
index 000000000..9c6b793bf
--- /dev/null
+++ b/app/views/my/blocks/_calendar.html.erb
@@ -0,0 +1,8 @@
+<h3><%= l(:label_calendar) %></h3>
+
+<% calendar = Redmine::Helpers::Calendar.new(Date.today, current_language, :week)
+   calendar.events = Issue.visible.find :all,
+                     :conditions => ["#{Issue.table_name}.project_id in (#{@user.projects.collect{|m| m.id}.join(',')}) AND ((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", calendar.startdt, calendar.enddt, calendar.startdt, calendar.enddt],
+                     :include => [:project, :tracker, :priority, :assigned_to] unless @user.projects.empty? %>
+
+<%= render :partial => 'common/calendar', :locals => {:calendar => calendar } %>
diff --git a/app/views/my/blocks/_calendar.rhtml b/app/views/my/blocks/_calendar.rhtml
deleted file mode 100644
index 9c6b793bf..000000000
--- a/app/views/my/blocks/_calendar.rhtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<h3><%= l(:label_calendar) %></h3>
-
-<% calendar = Redmine::Helpers::Calendar.new(Date.today, current_language, :week)
-   calendar.events = Issue.visible.find :all,
-                     :conditions => ["#{Issue.table_name}.project_id in (#{@user.projects.collect{|m| m.id}.join(',')}) AND ((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", calendar.startdt, calendar.enddt, calendar.startdt, calendar.enddt],
-                     :include => [:project, :tracker, :priority, :assigned_to] unless @user.projects.empty? %>
-
-<%= render :partial => 'common/calendar', :locals => {:calendar => calendar } %>