From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 4 Oct 2011 13:41:05 +0000 (+0000)
Subject: Rails3: rename app/views/journals/index.rxml to app/views/journals/index.builder... 
X-Git-Tag: 1.3.0~404
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1a23663176fa4b7b5f9ff8f9e46b261400c952a1;p=redmine.git

Rails3: rename app/views/journals/index.rxml to app/views/journals/index.builder (#6317)

: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@7577 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/journals/index.builder b/app/views/journals/index.builder
new file mode 100644
index 000000000..4c1e678bf
--- /dev/null
+++ b/app/views/journals/index.builder
@@ -0,0 +1,30 @@
+xml.instruct!
+xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
+  xml.title   @title
+  xml.link    "rel" => "self", "href" => url_for(:format => 'atom', :key => User.current.rss_key, :only_path => false)
+  xml.link    "rel" => "alternate", "href" => home_url(:only_path => false)
+  xml.id      url_for(:controller => 'welcome', :only_path => false)
+  xml.updated((@journals.first ? @journals.first.event_datetime : Time.now).xmlschema)
+  xml.author  { xml.name "#{Setting.app_title}" }
+  @journals.each do |change|
+    issue = change.issue
+    xml.entry do
+      xml.title   "#{issue.project.name} - #{issue.tracker.name} ##{issue.id}: #{issue.subject}"
+      xml.link    "rel" => "alternate", "href" => url_for(:controller => 'issues' , :action => 'show', :id => issue, :only_path => false)
+      xml.id      url_for(:controller => 'issues' , :action => 'show', :id => issue, :journal_id => change, :only_path => false)
+      xml.updated change.created_on.xmlschema
+      xml.author do
+        xml.name change.user.name
+        xml.email(change.user.mail) if change.user.is_a?(User) && !change.user.mail.blank? && !change.user.pref.hide_mail
+      end
+      xml.content "type" => "html" do
+        xml.text! '<ul>'
+        change.details.each do |detail|
+          xml.text! '<li>' + show_detail(detail, false) + '</li>'
+        end
+        xml.text! '</ul>'
+        xml.text! textilizable(change, :notes, :only_path => false) unless change.notes.blank?
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/views/journals/index.rxml b/app/views/journals/index.rxml
deleted file mode 100644
index 4c1e678bf..000000000
--- a/app/views/journals/index.rxml
+++ /dev/null
@@ -1,30 +0,0 @@
-xml.instruct!
-xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
-  xml.title   @title
-  xml.link    "rel" => "self", "href" => url_for(:format => 'atom', :key => User.current.rss_key, :only_path => false)
-  xml.link    "rel" => "alternate", "href" => home_url(:only_path => false)
-  xml.id      url_for(:controller => 'welcome', :only_path => false)
-  xml.updated((@journals.first ? @journals.first.event_datetime : Time.now).xmlschema)
-  xml.author  { xml.name "#{Setting.app_title}" }
-  @journals.each do |change|
-    issue = change.issue
-    xml.entry do
-      xml.title   "#{issue.project.name} - #{issue.tracker.name} ##{issue.id}: #{issue.subject}"
-      xml.link    "rel" => "alternate", "href" => url_for(:controller => 'issues' , :action => 'show', :id => issue, :only_path => false)
-      xml.id      url_for(:controller => 'issues' , :action => 'show', :id => issue, :journal_id => change, :only_path => false)
-      xml.updated change.created_on.xmlschema
-      xml.author do
-        xml.name change.user.name
-        xml.email(change.user.mail) if change.user.is_a?(User) && !change.user.mail.blank? && !change.user.pref.hide_mail
-      end
-      xml.content "type" => "html" do
-        xml.text! '<ul>'
-        change.details.each do |detail|
-          xml.text! '<li>' + show_detail(detail, false) + '</li>'
-        end
-        xml.text! '</ul>'
-        xml.text! textilizable(change, :notes, :only_path => false) unless change.notes.blank?
-      end
-    end
-  end
-end
\ No newline at end of file