summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-07-06 11:02:37 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-07-06 11:02:37 +0000
commit50755b59139e86e8351e37a0176ca7bd98b2744c (patch)
treeb2872880a4991a73c91a978a89918775c4aebab5
parent5b0051e7106b9d78169ac98f9a47721c286df131 (diff)
downloadredmine-50755b59139e86e8351e37a0176ca7bd98b2744c.tar.gz
redmine-50755b59139e86e8351e37a0176ca7bd98b2744c.zip
Merged r1585 from trunk.
git-svn-id: http://redmine.rubyforge.org/svn/branches/0.7-stable@1631 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/common/feed.atom.rxml6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/common/feed.atom.rxml b/app/views/common/feed.atom.rxml
index 8ceffc91c..c1b88a28e 100644
--- a/app/views/common/feed.atom.rxml
+++ b/app/views/common/feed.atom.rxml
@@ -10,7 +10,11 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
@items.each do |item|
xml.entry do
url = url_for(item.event_url(:only_path => false))
- xml.title truncate_single_line(item.event_title, 100)
+ if @project
+ xml.title truncate_single_line(item.event_title, 100)
+ else
+ xml.title truncate_single_line("#{item.project} - #{item.event_title}", 100)
+ end
xml.link "rel" => "alternate", "href" => url
xml.id url
xml.updated item.event_datetime.xmlschema